From 7447ef0fc24dc046b92b55e75c02ff0725b85680 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 8 May 2010 01:18:53 -0400 Subject: [PATCH] Make 3.0 parallel-installable to 2.x In particular, rename - libraries to lib*-3.0.so - pc files to *-3.0.pc - include paths to /usr/include/gtk-3.0/* - module paths to /usr/lib/gtk-3.0/* - rc files names to gtk-3.0/gtkrc - commandline utilities to *-3.0 - adjust documentation Also change the install location for unix-print headers to /usr/include/gtk-3.0/unix-print/gtk. --- Makefile.am | 57 +- configure.ac | 22 +- demos/Makefile.am | 4 +- demos/gtk-demo/Makefile.am | 4 +- docs/reference/gdk-pixbuf/Makefile.am | 8 +- ...csource.xml => gdk-pixbuf-csource-3.0.xml} | 26 +- ...s.xml => gdk-pixbuf-query-loaders-3.0.xml} | 18 +- docs/reference/gdk-pixbuf/gdk-pixbuf.sgml | 6 +- docs/reference/gdk-pixbuf/tmpl/animation.sgml | 20 +- docs/reference/gdk-pixbuf/tmpl/creating.sgml | 3 + .../gdk-pixbuf/tmpl/file-loading.sgml | 3 + .../gdk-pixbuf/tmpl/file-saving.sgml | 3 + .../gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml | 4 + .../gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml | 30 + .../tmpl/gdk-pixbuf-xlib-from-drawables.sgml | 3 + .../gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml | 3 + .../tmpl/gdk-pixbuf-xlib-rendering.sgml | 3 + .../gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml | 10 + .../reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml | 3 + .../tmpl/initialization_versions.sgml | 3 + docs/reference/gdk-pixbuf/tmpl/inline.sgml | 3 + .../gdk-pixbuf/tmpl/module_interface.sgml | 4 + .../gdk-pixbuf/tmpl/refcounting.sgml | 16 +- docs/reference/gdk-pixbuf/tmpl/scaling.sgml | 3 + docs/reference/gdk-pixbuf/tmpl/util.sgml | 3 + .../reference/gdk/tmpl/cairo_interaction.sgml | 3 + docs/reference/gdk/tmpl/colors.sgml | 5 + docs/reference/gdk/tmpl/cursors.sgml | 5 + docs/reference/gdk/tmpl/dnd.sgml | 4 + docs/reference/gdk/tmpl/drawing.sgml | 3 + docs/reference/gdk/tmpl/event_structs.sgml | 3 + docs/reference/gdk/tmpl/events.sgml | 7 + docs/reference/gdk/tmpl/fonts.sgml | 3 + docs/reference/gdk/tmpl/gcs.sgml | 3 + docs/reference/gdk/tmpl/gdk-unused.sgml | 8 + .../gdk/tmpl/gdkapplaunchcontext.sgml | 4 + docs/reference/gdk/tmpl/gdkdisplay.sgml | 4 + .../reference/gdk/tmpl/gdkdisplaymanager.sgml | 4 + docs/reference/gdk/tmpl/gdkscreen.sgml | 4 + docs/reference/gdk/tmpl/gdktesting.sgml | 3 + docs/reference/gdk/tmpl/general.sgml | 18 + docs/reference/gdk/tmpl/images.sgml | 3 + docs/reference/gdk/tmpl/input.sgml | 3 + docs/reference/gdk/tmpl/input_devices.sgml | 5 + docs/reference/gdk/tmpl/keys.sgml | 13 + .../reference/gdk/tmpl/pango_interaction.sgml | 4 + docs/reference/gdk/tmpl/pixbufs.sgml | 9 + docs/reference/gdk/tmpl/pixmaps.sgml | 5 + docs/reference/gdk/tmpl/properties.sgml | 3 + docs/reference/gdk/tmpl/regions.sgml | 4 + docs/reference/gdk/tmpl/rgb.sgml | 15 +- docs/reference/gdk/tmpl/selections.sgml | 3 + docs/reference/gdk/tmpl/threads.sgml | 6 + docs/reference/gdk/tmpl/visuals.sgml | 8 + docs/reference/gdk/tmpl/windows.sgml | 8 +- docs/reference/gdk/tmpl/x_interaction.sgml | 8 + docs/reference/gtk/Makefile.am | 15 +- ...onvert.xml => gtk-builder-convert-3.0.xml} | 8 +- docs/reference/gtk/gtk-docs.sgml | 6 +- ...es-2.0.xml => gtk-query-immodules-3.0.xml} | 20 +- ...ache.xml => gtk-update-icon-cache-3.0.xml} | 44 +- docs/reference/gtk/question_index.sgml | 2 +- docs/reference/gtk/running.sgml | 92 +- docs/reference/gtk/tmpl/gtk-unused.sgml | 7802 +++++++++++++---- docs/reference/gtk/tmpl/gtkaccelmap.sgml | 4 + docs/reference/gtk/tmpl/gtkactiongroup.sgml | 3 + docs/reference/gtk/tmpl/gtkadjustment.sgml | 3 + docs/reference/gtk/tmpl/gtkbindings.sgml | 29 +- docs/reference/gtk/tmpl/gtkbutton.sgml | 4 + docs/reference/gtk/tmpl/gtkcalendar.sgml | 26 +- docs/reference/gtk/tmpl/gtkcelleditable.sgml | 3 + docs/reference/gtk/tmpl/gtkcelllayout.sgml | 3 + docs/reference/gtk/tmpl/gtkcellrenderer.sgml | 3 + .../gtk/tmpl/gtkcellrendereraccel.sgml | 4 + .../gtk/tmpl/gtkcellrenderercombo.sgml | 4 + .../gtk/tmpl/gtkcellrendererpixbuf.sgml | 4 + .../gtk/tmpl/gtkcellrendererprogress.sgml | 4 + .../gtk/tmpl/gtkcellrendererspin.sgml | 4 + .../gtk/tmpl/gtkcellrenderertext.sgml | 4 + .../gtk/tmpl/gtkcellrenderertoggle.sgml | 4 + docs/reference/gtk/tmpl/gtkcellview.sgml | 13 +- docs/reference/gtk/tmpl/gtkcheckbutton.sgml | 4 + docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml | 4 + docs/reference/gtk/tmpl/gtkclipboard.sgml | 3 + docs/reference/gtk/tmpl/gtkcolorbutton.sgml | 4 + docs/reference/gtk/tmpl/gtkcolorsel.sgml | 31 +- docs/reference/gtk/tmpl/gtkcolorseldlg.sgml | 3 + docs/reference/gtk/tmpl/gtkcombobox.sgml | 5 + docs/reference/gtk/tmpl/gtkcomboboxentry.sgml | 5 + docs/reference/gtk/tmpl/gtkcontainer.sgml | 179 +- docs/reference/gtk/tmpl/gtkdialog.sgml | 4 + docs/reference/gtk/tmpl/gtkdnd.sgml | 25 +- docs/reference/gtk/tmpl/gtkdrawingarea.sgml | 19 +- docs/reference/gtk/tmpl/gtkeditable.sgml | 3 + docs/reference/gtk/tmpl/gtkentry.sgml | 22 + docs/reference/gtk/tmpl/gtkentrybuffer.sgml | 3 + .../gtk/tmpl/gtkentrycompletion.sgml | 4 + docs/reference/gtk/tmpl/gtkenums.sgml | 34 +- docs/reference/gtk/tmpl/gtkeventbox.sgml | 4 + docs/reference/gtk/tmpl/gtkexpander.sgml | 3 + docs/reference/gtk/tmpl/gtkfeatures.sgml | 3 + .../gtk/tmpl/gtkfilechooserbutton.sgml | 3 + .../gtk/tmpl/gtkfilechooserdialog.sgml | 25 +- .../gtk/tmpl/gtkfilechooserwidget.sgml | 13 +- docs/reference/gtk/tmpl/gtkfilefilter.sgml | 4 + docs/reference/gtk/tmpl/gtkfixed.sgml | 6 + docs/reference/gtk/tmpl/gtkfontbutton.sgml | 4 + docs/reference/gtk/tmpl/gtkfontsel.sgml | 13 +- docs/reference/gtk/tmpl/gtkfontseldlg.sgml | 21 +- docs/reference/gtk/tmpl/gtkframe.sgml | 3 + docs/reference/gtk/tmpl/gtkgc.sgml | 3 + docs/reference/gtk/tmpl/gtkhandlebox.sgml | 4 + docs/reference/gtk/tmpl/gtkhbbox.sgml | 6 + docs/reference/gtk/tmpl/gtkhpaned.sgml | 4 + docs/reference/gtk/tmpl/gtkhruler.sgml | 4 + docs/reference/gtk/tmpl/gtkhscale.sgml | 3 + docs/reference/gtk/tmpl/gtkhscrollbar.sgml | 3 + docs/reference/gtk/tmpl/gtkhseparator.sgml | 4 + docs/reference/gtk/tmpl/gtkhsv.sgml | 4 + docs/reference/gtk/tmpl/gtkiconfactory.sgml | 6 + docs/reference/gtk/tmpl/gtkicontheme.sgml | 20 + docs/reference/gtk/tmpl/gtkiconview.sgml | 4 + docs/reference/gtk/tmpl/gtkimagemenuitem.sgml | 4 + docs/reference/gtk/tmpl/gtkimcontext.sgml | 3 + .../gtk/tmpl/gtkimcontextsimple.sgml | 4 + .../reference/gtk/tmpl/gtkimmulticontext.sgml | 4 + docs/reference/gtk/tmpl/gtkinvisible.sgml | 4 + docs/reference/gtk/tmpl/gtkitem.sgml | 3 + docs/reference/gtk/tmpl/gtklabel.sgml | 23 +- docs/reference/gtk/tmpl/gtklayout.sgml | 19 +- docs/reference/gtk/tmpl/gtklinkbutton.sgml | 3 + docs/reference/gtk/tmpl/gtkliststore.sgml | 3 + docs/reference/gtk/tmpl/gtkmain.sgml | 17 + docs/reference/gtk/tmpl/gtkmenu.sgml | 4 + docs/reference/gtk/tmpl/gtkmenubar.sgml | 35 +- docs/reference/gtk/tmpl/gtkmenuitem.sgml | 20 +- docs/reference/gtk/tmpl/gtkmenushell.sgml | 3 + .../reference/gtk/tmpl/gtkmenutoolbutton.sgml | 14 +- docs/reference/gtk/tmpl/gtkmisc.sgml | 3 + docs/reference/gtk/tmpl/gtknotebook.sgml | 95 +- docs/reference/gtk/tmpl/gtkobject.sgml | 351 +- docs/reference/gtk/tmpl/gtkorientable.sgml | 3 + docs/reference/gtk/tmpl/gtkpagesetup.sgml | 4 + .../gtk/tmpl/gtkpagesetupunixdialog.sgml | 3 + docs/reference/gtk/tmpl/gtkpaned.sgml | 12 + docs/reference/gtk/tmpl/gtkpapersize.sgml | 4 + docs/reference/gtk/tmpl/gtkprintcontext.sgml | 3 + docs/reference/gtk/tmpl/gtkprinter.sgml | 3 + docs/reference/gtk/tmpl/gtkprintjob.sgml | 3 + .../reference/gtk/tmpl/gtkprintoperation.sgml | 4 + docs/reference/gtk/tmpl/gtkprintsettings.sgml | 4 + .../gtk/tmpl/gtkprintunixdialog.sgml | 3 + docs/reference/gtk/tmpl/gtkprogress.sgml | 3 + docs/reference/gtk/tmpl/gtkprogressbar.sgml | 88 +- docs/reference/gtk/tmpl/gtkradioaction.sgml | 3 + docs/reference/gtk/tmpl/gtkradiobutton.sgml | 3 + docs/reference/gtk/tmpl/gtkradiomenuitem.sgml | 10 +- .../gtk/tmpl/gtkradiotoolbutton.sgml | 3 + docs/reference/gtk/tmpl/gtkrange.sgml | 3 + docs/reference/gtk/tmpl/gtkrc.sgml | 122 +- docs/reference/gtk/tmpl/gtkrecentaction.sgml | 3 + docs/reference/gtk/tmpl/gtkrecentchooser.sgml | 21 +- .../gtk/tmpl/gtkrecentchooserdialog.sgml | 3 + .../gtk/tmpl/gtkrecentchoosermenu.sgml | 4 + .../gtk/tmpl/gtkrecentchooserwidget.sgml | 4 + docs/reference/gtk/tmpl/gtkrecentfilter.sgml | 4 + docs/reference/gtk/tmpl/gtkrecentmanager.sgml | 23 +- docs/reference/gtk/tmpl/gtkruler.sgml | 3 + docs/reference/gtk/tmpl/gtkscale.sgml | 3 + docs/reference/gtk/tmpl/gtkscalebutton.sgml | 21 +- docs/reference/gtk/tmpl/gtkscrollbar.sgml | 3 + .../reference/gtk/tmpl/gtkscrolledwindow.sgml | 3 + docs/reference/gtk/tmpl/gtkselection.sgml | 12 +- docs/reference/gtk/tmpl/gtkseparator.sgml | 3 + .../gtk/tmpl/gtkseparatormenuitem.sgml | 4 + .../gtk/tmpl/gtkseparatortoolitem.sgml | 4 + docs/reference/gtk/tmpl/gtksettings.sgml | 4 + docs/reference/gtk/tmpl/gtksizegroup.sgml | 3 + docs/reference/gtk/tmpl/gtkspinbutton.sgml | 14 +- docs/reference/gtk/tmpl/gtkstatusbar.sgml | 4 + docs/reference/gtk/tmpl/gtkstatusicon.sgml | 13 +- docs/reference/gtk/tmpl/gtkstyle.sgml | 82 +- docs/reference/gtk/tmpl/gtktable.sgml | 3 + .../gtk/tmpl/gtktearoffmenuitem.sgml | 4 + docs/reference/gtk/tmpl/gtktextbuffer.sgml | 3 + docs/reference/gtk/tmpl/gtktextiter.sgml | 3 + docs/reference/gtk/tmpl/gtktextmark.sgml | 3 + docs/reference/gtk/tmpl/gtktexttag.sgml | 4 + docs/reference/gtk/tmpl/gtktexttagtable.sgml | 4 + docs/reference/gtk/tmpl/gtktextview.sgml | 41 + docs/reference/gtk/tmpl/gtktoggleaction.sgml | 3 + docs/reference/gtk/tmpl/gtktogglebutton.sgml | 4 + .../gtk/tmpl/gtktoggletoolbutton.sgml | 4 + docs/reference/gtk/tmpl/gtktoolbar.sgml | 229 +- docs/reference/gtk/tmpl/gtktoolbutton.sgml | 3 + docs/reference/gtk/tmpl/gtktoolitem.sgml | 15 +- docs/reference/gtk/tmpl/gtktooltip.sgml | 3 + docs/reference/gtk/tmpl/gtktreednd.sgml | 3 + docs/reference/gtk/tmpl/gtktreemodel.sgml | 29 +- .../gtk/tmpl/gtktreemodelfilter.sgml | 3 + docs/reference/gtk/tmpl/gtktreemodelsort.sgml | 3 + docs/reference/gtk/tmpl/gtktreeselection.sgml | 3 + docs/reference/gtk/tmpl/gtktreesortable.sgml | 3 + docs/reference/gtk/tmpl/gtktreestore.sgml | 3 + docs/reference/gtk/tmpl/gtktreeview.sgml | 28 +- .../reference/gtk/tmpl/gtktreeviewcolumn.sgml | 4 + docs/reference/gtk/tmpl/gtktypeutils.sgml | 576 +- docs/reference/gtk/tmpl/gtkuimanager.sgml | 4 + docs/reference/gtk/tmpl/gtkwindow.sgml | 6 + docs/reference/gtk/tmpl/gtkwindowgroup.sgml | 4 + ...stalled.pc.in => gdk-3.0-uninstalled.pc.in | 2 +- gdk-2.0.pc.in => gdk-3.0.pc.in | 4 +- ....pc.in => gdk-pixbuf-3.0-uninstalled.pc.in | 0 gdk-pixbuf-2.0.pc.in => gdk-pixbuf-3.0.pc.in | 2 +- gdk-pixbuf/Makefile.am | 54 +- gdk-pixbuf/gdk-pixbuf-csource.c | 4 +- gdk-pixbuf/queryloaders.c | 2 +- gdk/Makefile.am | 52 +- gdk/x11/Makefile.am | 2 +- ...talled.pc.in => gtk+-3.0-uninstalled.pc.in | 2 +- gtk+-2.0.pc.in => gtk+-3.0.pc.in | 4 +- ...int-2.0.pc.in => gtk+-unix-print-3.0.pc.in | 4 +- gtk/Makefile.am | 104 +- ...uilder-convert => gtk-builder-convert-3.0} | 6 +- gtk/gtkfilechooser.c | 4 +- gtk/gtkimcontext.c | 2 +- gtk/gtkmodules.c | 6 +- gtk/gtkrc.c | 14 +- gtk/tests/Makefile.am | 4 +- modules/engines/ms-windows/Makefile.am | 4 +- modules/engines/ms-windows/Theme/Makefile.am | 2 +- .../Theme/{gtk-2.0 => gtk-3.0}/Makefile.am | 0 .../Theme/{gtk-2.0 => gtk-3.0}/gtkrc | 0 modules/engines/pixbuf/Makefile.am | 10 +- modules/input/Makefile.am | 22 +- modules/other/gail/Makefile.am | 2 +- modules/printbackends/cups/Makefile.am | 2 +- modules/printbackends/file/Makefile.am | 2 +- modules/printbackends/lpr/Makefile.am | 4 +- modules/printbackends/test/Makefile.am | 2 +- perf/Makefile.am | 2 +- tests/Makefile.am | 10 +- 242 files changed, 7560 insertions(+), 3967 deletions(-) rename docs/reference/gdk-pixbuf/{gdk-pixbuf-csource.xml => gdk-pixbuf-csource-3.0.xml} (85%) rename docs/reference/gdk-pixbuf/{gdk-pixbuf-query-loaders.xml => gdk-pixbuf-query-loaders-3.0.xml} (64%) rename docs/reference/gtk/{gtk-builder-convert.xml => gtk-builder-convert-3.0.xml} (86%) rename docs/reference/gtk/{gtk-query-immodules-2.0.xml => gtk-query-immodules-3.0.xml} (71%) rename docs/reference/gtk/{gtk-update-icon-cache.xml => gtk-update-icon-cache-3.0.xml} (60%) rename gdk-2.0-uninstalled.pc.in => gdk-3.0-uninstalled.pc.in (84%) rename gdk-2.0.pc.in => gdk-3.0.pc.in (60%) rename gdk-pixbuf-2.0-uninstalled.pc.in => gdk-pixbuf-3.0-uninstalled.pc.in (100%) rename gdk-pixbuf-2.0.pc.in => gdk-pixbuf-3.0.pc.in (79%) rename gtk+-2.0-uninstalled.pc.in => gtk+-3.0-uninstalled.pc.in (84%) rename gtk+-2.0.pc.in => gtk+-3.0.pc.in (72%) rename gtk+-unix-print-2.0.pc.in => gtk+-unix-print-3.0.pc.in (66%) rename gtk/{gtk-builder-convert => gtk-builder-convert-3.0} (99%) rename modules/engines/ms-windows/Theme/{gtk-2.0 => gtk-3.0}/Makefile.am (100%) rename modules/engines/ms-windows/Theme/{gtk-2.0 => gtk-3.0}/gtkrc (100%) diff --git a/Makefile.am b/Makefile.am index 669c8d6591..48620908a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,6 @@ include $(top_srcdir)/Makefile.decl SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build -# require automake 1.4 AUTOMAKE_OPTIONS = 1.7 ACLOCAL_AMFLAGS = -I m4 @@ -132,36 +131,36 @@ MAINTAINERCLEANFILES = \ GDKTARGET=@gdktarget@ ## Copy .pc files to target-specific names -gtk+-$(GDKTARGET)-2.0.pc: gtk+-2.0.pc - rm -f gtk+-$(GDKTARGET)-2.0.pc && \ - cp gtk+-2.0.pc gtk+-$(GDKTARGET)-2.0.pc +gtk+-$(GDKTARGET)-3.0.pc: gtk+-3.0.pc + rm -f gtk+-$(GDKTARGET)-3.0.pc && \ + cp gtk+-3.0.pc gtk+-$(GDKTARGET)-3.0.pc -gdk-$(GDKTARGET)-2.0.pc: gdk-2.0.pc - rm -f gdk-$(GDKTARGET)-2.0.pc && \ - cp gdk-2.0.pc gdk-$(GDKTARGET)-2.0.pc +gdk-$(GDKTARGET)-3.0.pc: gdk-3.0.pc + rm -f gdk-$(GDKTARGET)-3.0.pc && \ + cp gdk-3.0.pc gdk-$(GDKTARGET)-3.0.pc -gtk+-$(GDKTARGET)-2.0-uninstalled.pc: gtk+-2.0-uninstalled.pc - rm -f gtk+-$(GDKTARGET)-2.0-uninstalled.pc && \ - cp gtk+-2.0-uninstalled.pc gtk+-$(GDKTARGET)-2.0-uninstalled.pc +gtk+-$(GDKTARGET)-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc + rm -f gtk+-$(GDKTARGET)-3.0-uninstalled.pc && \ + cp gtk+-3.0-uninstalled.pc gtk+-$(GDKTARGET)-3.0-uninstalled.pc -gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc - rm -f gdk-$(GDKTARGET)-2.0-uninstalled.pc && \ - cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc +gdk-$(GDKTARGET)-3.0-uninstalled.pc: gdk-3.0-uninstalled.pc + rm -f gdk-$(GDKTARGET)-3.0-uninstalled.pc && \ + cp gdk-3.0-uninstalled.pc gdk-$(GDKTARGET)-3.0-uninstalled.pc pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.pc +pkgconfig_DATA= gdk-pixbuf-3.0.pc gdk-$(GDKTARGET)-3.0.pc gtk+-$(GDKTARGET)-3.0.pc gail.pc if OS_UNIX -pkgconfig_DATA += gtk+-unix-print-2.0.pc +pkgconfig_DATA += gtk+-unix-print-3.0.pc endif DISTCLEANFILES = \ - gtk+-unix-print-2.0.pc \ - gtk+-$(GDKTARGET)-2.0.pc \ - gdk-$(GDKTARGET)-2.0.pc \ + gtk+-unix-print-3.0.pc \ + gtk+-$(GDKTARGET)-3.0.pc \ + gdk-$(GDKTARGET)-3.0.pc \ gail.pc \ - gtk+-$(GDKTARGET)-2.0-uninstalled.pc \ - gdk-$(GDKTARGET)-2.0-uninstalled.pc \ + gtk+-$(GDKTARGET)-3.0-uninstalled.pc \ + gdk-$(GDKTARGET)-3.0-uninstalled.pc \ gail-uninstalled.pc \ config.lt @@ -184,21 +183,21 @@ ChangeLog: echo A git checkout and git-log is required to generate this file >> $@); \ fi -## copy the default target for this platform to gdk-2.0.pc and gtk+-2.0.pc +## copy the default target for this platform to gdk-3.0.pc and gtk+-3.0.pc DEFAULT_GDKTARGET=x11 install-data-hook: (cd $(DESTDIR)$(pkgconfigdir) && \ - test -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \ - test -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \ - rm -f gdk-2.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \ - rm -f gtk+-2.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \ + test -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc && \ + test -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc && \ + rm -f gdk-3.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc gdk-3.0.pc && \ + rm -f gtk+-3.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc gtk+-3.0.pc) || \ (cd $(DESTDIR)$(pkgconfigdir) && \ - rm -f gdk-2.0.pc && cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \ - rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc) + rm -f gdk-3.0.pc && cp -f gdk-$(GDKTARGET)-3.0.pc gdk-3.0.pc && \ + rm -f gtk+-3.0.pc && cp -f gtk+-$(GDKTARGET)-3.0.pc gtk+-3.0.pc) uninstall-local: - rm -f $(DESTDIR)$(pkgconfigdir)/gdk-2.0.pc - rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-2.0.pc + rm -f $(DESTDIR)$(pkgconfigdir)/gdk-3.0.pc + rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc dist-hook: if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \ diff --git a/configure.ac b/configure.ac index 82361b3a8e..47d13092b4 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AC_PREREQ(2.62) # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0. m4_define([gtk_major_version], [2]) -m4_define([gtk_minor_version], [21]) +m4_define([gtk_minor_version], [90]) m4_define([gtk_micro_version], [0]) m4_define([gtk_interface_age], [0]) m4_define([gtk_binary_age], @@ -19,7 +19,7 @@ m4_define([gtk_binary_age], m4_define([gtk_version], [gtk_major_version.gtk_minor_version.gtk_micro_version]) # This is the X.Y used in -lgtk-FOO-X.Y -m4_define([gtk_api_version], [2.0]) +m4_define([gtk_api_version], [3.0]) # Define a string for the earliest version that this release has # backwards binary compatibility with for all interfaces a module @@ -28,7 +28,7 @@ m4_define([gtk_api_version], [2.0]) # for GTK+. # #GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT -m4_define([gtk_binary_version], [2.10.0]) +m4_define([gtk_binary_version], [3.0.0]) # required versions of other packages m4_define([glib_required_version], [2.23.6]) @@ -2108,14 +2108,14 @@ AC_CONFIG_FILES([ config.h.win32 gtk-zip.sh Makefile -gdk-pixbuf-2.0.pc -gdk-2.0.pc -gtk+-2.0.pc -gtk+-unix-print-2.0.pc +gdk-pixbuf-3.0.pc +gdk-3.0.pc +gtk+-3.0.pc +gtk+-unix-print-3.0.pc gail.pc -gdk-pixbuf-2.0-uninstalled.pc -gdk-2.0-uninstalled.pc -gtk+-2.0-uninstalled.pc +gdk-pixbuf-3.0-uninstalled.pc +gdk-3.0-uninstalled.pc +gtk+-3.0-uninstalled.pc gail-uninstalled.pc m4macros/Makefile po/Makefile.in @@ -2166,7 +2166,7 @@ modules/engines/Makefile modules/engines/pixbuf/Makefile modules/engines/ms-windows/Makefile modules/engines/ms-windows/Theme/Makefile -modules/engines/ms-windows/Theme/gtk-2.0/Makefile +modules/engines/ms-windows/Theme/gtk-3.0/Makefile modules/input/Makefile modules/printbackends/Makefile modules/printbackends/cups/Makefile diff --git a/demos/Makefile.am b/demos/Makefile.am index f87b3cd8b9..994166a6fb 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -41,8 +41,8 @@ if CROSS_COMPILING pixbuf_csource=$(GDK_PIXBUF_CSOURCE) pixbuf_csource_deps= else -pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource -pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders +pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource-3.0 +pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource-3.0 $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders endif test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index 698c242c0d..ffb11ac308 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am for gtk+/demos include $(top_srcdir)/Makefile.decl -democodedir=$(datadir)/gtk-2.0/demo +democodedir=$(datadir)/gtk-$(GTK_API_VERSION)/demo ## These should be in the order you want them to appear in the ## demo app, which means alphabetized by demo title, not filename @@ -99,7 +99,7 @@ IMAGEFILES= alphatest.png \ gnome-gmush.png \ gnome-gsame.png \ gnu-keys.png \ - gtk-logo-rgb.gif + gtk-logo-rgb.gif democode_DATA = $(demos) $(IMAGEFILES) demo.ui diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am index 7734e72e8d..f56aead785 100644 --- a/docs/reference/gdk-pixbuf/Makefile.am +++ b/docs/reference/gdk-pixbuf/Makefile.am @@ -56,8 +56,8 @@ content_files = \ gdk-pixbuf-rendering.sgml \ gdk-pixbuf.sgml \ porting-from-imlib.sgml \ - gdk-pixbuf-csource.xml \ - gdk-pixbuf-query-loaders.xml + gdk-pixbuf-csource-3.0.xml \ + gdk-pixbuf-query-loaders-3.0.xml # Images to copy into HTML directory HTML_IMAGES = composite.png @@ -81,7 +81,9 @@ EXTRA_DIST += version.xml.in \ if ENABLE_MAN -man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 +man_MANS = \ + gdk-pixbuf-csource-3.0.1 \ + gdk-pixbuf-query-loaders-3.0.1 %.1 : %.xml @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml b/docs/reference/gdk-pixbuf/gdk-pixbuf-csource-3.0.xml similarity index 85% rename from docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml rename to docs/reference/gdk-pixbuf/gdk-pixbuf-csource-3.0.xml index 36a042385e..e353f3a0a1 100644 --- a/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml +++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-csource-3.0.xml @@ -5,23 +5,23 @@ -gdk-pixbuf-csource +gdk-pixbuf-csource-3.0 1 -gdk-pixbuf-csource +gdk-pixbuf-csource-3.0 C code generation utility for GdkPixbuf images -gdk-pixbuf-csource +gdk-pixbuf-csource-3.0 options image -gdk-pixbuf-csource +gdk-pixbuf-csource-3.0 options --build-list @@ -33,16 +33,16 @@ Description -gdk-pixbuf-csource is a small utility that generates C code -containing images, useful for compiling images directly into programs. +gdk-pixbuf-csource-3.0 is a small utility that generates +C code containing images, useful for compiling images directly into programs. Invocation -gdk-pixbuf-csource either takes as input one image file name -to generate code for, or, using the option, a -list of (name, image) +gdk-pixbuf-csource-3.0 either takes as input one image file +name to generate code for, or, using the option, +a list of (name, image) pairs to generate code for a list of images into named variables. Options @@ -151,7 +151,7 @@ Make warnings fatal (causes the program to abort). See also -The GdkPixbuf documentation, shipped with the +The GdkPixbuf documentation, shipped with the Gtk+ distribution, available from www.gtk.org. @@ -166,11 +166,11 @@ generates pixbufs with suboptimal rowstride in some cases. Author -gdk-pixbuf-csource was written by Tim Janik -timj@gtk.org. +gdk-pixbuf-csource-3.0 was written by Tim Janik +timj@gtk.org. -This manual page was provided by Tim Janik timj@gtk.org. +This manual page was provided by Tim Janik timj@gtk.org. diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml b/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0.xml similarity index 64% rename from docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml rename to docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0.xml index 86fc866de5..7ff936ba75 100644 --- a/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml +++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0.xml @@ -5,30 +5,31 @@ -gdk-pixbuf-query-loaders +gdk-pixbuf-query-loaders-3.0 1 -gdk-pixbuf-query-loaders +gdk-pixbuf-query-loaders-3.0 GdkPixbuf loader registration utility -gdk-pixbuf-query-loaders +gdk-pixbuf-query-loaders-3.0 module Description -gdk-pixbuf-query-loaders collects information about loadable -modules for gdk-pixbuf and writes it to stdout. +gdk-pixbuf-query-loaders-3.0 collects information about +loadable modules for gdk-pixbuf and writes it to +stdout. If called without arguments, it looks for modules in the -gdk-pixbuf loader directory. +gdk-pixbuf loader directory. If called with arguments, it looks for the specified modules. The arguments @@ -39,8 +40,9 @@ may be absolute or relative paths. Environment The environment variable GDK_PIXBUF_MODULEDIR can be used -to specify a different loader directory. The default gdk-pixbuf loader -directory is libdir/gtk-2.0/version/loaders. +to specify a different loader directory. The default +gdk-pixbuf loader +directory is libdir/gtk-3.0/version/loaders. diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml index 675ad09569..4b8fc9e47f 100644 --- a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml +++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml @@ -104,12 +104,12 @@ This part presents the tools which are shipped with the - &gdk-pixbuf; library. + &gdk-pixbuf; library. - - + + diff --git a/docs/reference/gdk-pixbuf/tmpl/animation.sgml b/docs/reference/gdk-pixbuf/tmpl/animation.sgml index 776586d18c..d569f8af95 100644 --- a/docs/reference/gdk-pixbuf/tmpl/animation.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/animation.sgml @@ -23,6 +23,9 @@ Animated images. + + + An opaque struct representing an animation. @@ -46,23 +49,6 @@ certain position in an animation. @Returns: - - - - - -@animation: -@Returns: - - - - - - - -@animation: - - diff --git a/docs/reference/gdk-pixbuf/tmpl/creating.sgml b/docs/reference/gdk-pixbuf/tmpl/creating.sgml index c4f38b1d02..ffd7bd12ac 100644 --- a/docs/reference/gdk-pixbuf/tmpl/creating.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/creating.sgml @@ -46,6 +46,9 @@ Creating a pixbuf from image data that is already in memory. + + + diff --git a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml b/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml index 8e51ce9c3c..84a461c8cb 100644 --- a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml @@ -28,6 +28,9 @@ Loading a pixbuf from a file. + + + diff --git a/docs/reference/gdk-pixbuf/tmpl/file-saving.sgml b/docs/reference/gdk-pixbuf/tmpl/file-saving.sgml index 13c5948cfd..d81557a9c4 100644 --- a/docs/reference/gdk-pixbuf/tmpl/file-saving.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/file-saving.sgml @@ -21,6 +21,9 @@ to a socket or store it in a database. + + + diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml index 129be6b4d0..3892e84ccb 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml @@ -72,6 +72,9 @@ Application-driven progressive image loading. + + + The GdkPixbufLoader struct contains only private @@ -114,6 +117,7 @@ fields. +@void: @Returns: diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml index a9891e0bf8..89af1484c0 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml @@ -553,3 +553,33 @@ End: + + + + + +@animation: +@Returns: + + + + + + +@animation: + + + + + + +@pixbuf: +@Returns: + + + + + + +@pixbuf: + diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml index e89a3adee2..aaedfecea8 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml @@ -26,6 +26,9 @@ Getting parts of an X drawable's image data into a pixbuf. + + + diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml index 5fec563dc1..d9607801a4 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml @@ -23,6 +23,9 @@ Initializing the &gdk-pixbuf; Xlib library. + + + diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml index a5558c2084..f16665c581 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml @@ -24,6 +24,9 @@ Rendering a pixbuf to an X drawable. + + + diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml index 1e22040171..5763f89b89 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml @@ -20,6 +20,9 @@ Rendering RGB buffers to X drawables. + + + FIXME: Describe this. @@ -198,6 +201,7 @@ displays. +@void: @Returns: @@ -230,6 +234,7 @@ displays. +@void: @Returns: @@ -238,6 +243,7 @@ displays. +@void: @Returns: @@ -246,6 +252,7 @@ displays. +@void: @Returns: @@ -254,6 +261,7 @@ displays. +@void: @Returns: @@ -262,6 +270,7 @@ displays. +@void: @Returns: @@ -270,6 +279,7 @@ displays. +@void: @Returns: + + + An error code in the #GDK_PIXBUF_ERROR domain. Many &gdk-pixbuf; diff --git a/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml b/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml index 7e7364b68f..b3cce4122b 100644 --- a/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml @@ -19,6 +19,9 @@ you're linking against. + + + Contains the full version of the &gdk-pixbuf; library as a string. diff --git a/docs/reference/gdk-pixbuf/tmpl/inline.sgml b/docs/reference/gdk-pixbuf/tmpl/inline.sgml index f9dfe8d330..0b8da2cfc0 100644 --- a/docs/reference/gdk-pixbuf/tmpl/inline.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/inline.sgml @@ -22,6 +22,9 @@ into #GdkPixbufs, use gdk_pixbuf_from_pixdata. + + + diff --git a/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml b/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml index 441f1237cd..49abfe467d 100644 --- a/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml @@ -68,6 +68,9 @@ They are not covered by the same stability guarantees as the regular + + + @@ -84,6 +87,7 @@ They are not covered by the same stability guarantees as the regular +@void: @Returns: diff --git a/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml b/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml index b894022848..d4367150d9 100644 --- a/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml @@ -48,21 +48,7 @@ Functions for reference counting and memory management on pixbufs. - - - - - -@pixbuf: -@Returns: - - - - - - - -@pixbuf: + diff --git a/docs/reference/gdk-pixbuf/tmpl/scaling.sgml b/docs/reference/gdk-pixbuf/tmpl/scaling.sgml index 5c26be2430..6550cd59a6 100644 --- a/docs/reference/gdk-pixbuf/tmpl/scaling.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/scaling.sgml @@ -81,6 +81,9 @@ expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data) + + + This enumeration describes the different interpolation modes that diff --git a/docs/reference/gdk-pixbuf/tmpl/util.sgml b/docs/reference/gdk-pixbuf/tmpl/util.sgml index 7770b77891..fd54648882 100644 --- a/docs/reference/gdk-pixbuf/tmpl/util.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/util.sgml @@ -20,6 +20,9 @@ Utility and miscellaneous convenience functions. + + + diff --git a/docs/reference/gdk/tmpl/cairo_interaction.sgml b/docs/reference/gdk/tmpl/cairo_interaction.sgml index 7ada736cf6..fc7fbf56ad 100644 --- a/docs/reference/gdk/tmpl/cairo_interaction.sgml +++ b/docs/reference/gdk/tmpl/cairo_interaction.sgml @@ -27,6 +27,9 @@ Cairo paths and to use pixbufs as sources for drawing operations. + + + diff --git a/docs/reference/gdk/tmpl/colors.sgml b/docs/reference/gdk/tmpl/colors.sgml index 31a09f72ae..3d1a8749f1 100644 --- a/docs/reference/gdk/tmpl/colors.sgml +++ b/docs/reference/gdk/tmpl/colors.sgml @@ -46,6 +46,9 @@ gdk_color_change() will probably become aliases. + + + The #GdkColor structure is used to describe an @@ -102,6 +105,7 @@ The colormap structure contains the following public fields. +@void: @Returns: @@ -109,6 +113,7 @@ The colormap structure contains the following public fields. +@void: @Returns: diff --git a/docs/reference/gdk/tmpl/cursors.sgml b/docs/reference/gdk/tmpl/cursors.sgml index 8d45cfab08..89abff656b 100644 --- a/docs/reference/gdk/tmpl/cursors.sgml +++ b/docs/reference/gdk/tmpl/cursors.sgml @@ -31,6 +31,9 @@ gdk_window_set_cursor() or by setting the cursor member of the + + + A GdkCursor structure represents a cursor. @@ -212,3 +215,5 @@ The standard cursors available. @cursor: + + diff --git a/docs/reference/gdk/tmpl/dnd.sgml b/docs/reference/gdk/tmpl/dnd.sgml index 3d1b521c7c..dd9c18b30d 100644 --- a/docs/reference/gdk/tmpl/dnd.sgml +++ b/docs/reference/gdk/tmpl/dnd.sgml @@ -25,6 +25,9 @@ the GTK+ documentation for more information. + + + @@ -54,6 +57,7 @@ the GTK+ documentation for more information. +@void: @Returns: diff --git a/docs/reference/gdk/tmpl/drawing.sgml b/docs/reference/gdk/tmpl/drawing.sgml index 73071405cf..9cd73f81f3 100644 --- a/docs/reference/gdk/tmpl/drawing.sgml +++ b/docs/reference/gdk/tmpl/drawing.sgml @@ -34,6 +34,9 @@ gtk_widget_create_pango_layout(). + + + An opaque structure representing an object that can be diff --git a/docs/reference/gdk/tmpl/event_structs.sgml b/docs/reference/gdk/tmpl/event_structs.sgml index cd94fdebc7..42c54b06f2 100644 --- a/docs/reference/gdk/tmpl/event_structs.sgml +++ b/docs/reference/gdk/tmpl/event_structs.sgml @@ -23,6 +23,9 @@ required events are received. See gtk_widget_set_events(). + + + The #GdkEvent struct contains a union of all of the event structs, diff --git a/docs/reference/gdk/tmpl/events.sgml b/docs/reference/gdk/tmpl/events.sgml index efb9e3e873..392cd078e5 100644 --- a/docs/reference/gdk/tmpl/events.sgml +++ b/docs/reference/gdk/tmpl/events.sgml @@ -30,6 +30,9 @@ The structs used for each type of event. + + + Specifies the type of the event. @@ -165,6 +168,7 @@ is given in the GLib Main Loop. +@void: @Returns: @@ -172,6 +176,7 @@ is given in the GLib Main Loop. +@void: @Returns: @@ -179,6 +184,7 @@ is given in the GLib Main Loop. +@void: @Returns: @@ -332,6 +338,7 @@ gdk_event_handler_set(). +@void: @Returns: diff --git a/docs/reference/gdk/tmpl/fonts.sgml b/docs/reference/gdk/tmpl/fonts.sgml index 25efd2dc48..1f68fb732d 100644 --- a/docs/reference/gdk/tmpl/fonts.sgml +++ b/docs/reference/gdk/tmpl/fonts.sgml @@ -264,6 +264,9 @@ here). + + + The GdkFont structure represents a font or fontset. It diff --git a/docs/reference/gdk/tmpl/gcs.sgml b/docs/reference/gdk/tmpl/gcs.sgml index 7d445ede7a..2897bcb35f 100644 --- a/docs/reference/gdk/tmpl/gcs.sgml +++ b/docs/reference/gdk/tmpl/gcs.sgml @@ -33,6 +33,9 @@ be set by the latter method. + + + The #GdkGC structure represents a graphics context. diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml index adb7170f01..13b0c19c3e 100644 --- a/docs/reference/gdk/tmpl/gdk-unused.sgml +++ b/docs/reference/gdk/tmpl/gdk-unused.sgml @@ -923,6 +923,14 @@ they will be ignored. + + +Gets the colormap set by GdkRGB. This colormap and the corresponding +visual should be used when creating windows that will be drawn in by GdkRGB. + + +@Returns: The #GdkColormap set by GdkRGB. + diff --git a/docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml b/docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml index 2d1f8ff9ca..78928a4ebe 100644 --- a/docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml +++ b/docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml @@ -36,6 +36,9 @@ g_object_unref (context); + + + An opaque structure representing an application launch context. @@ -47,6 +50,7 @@ An opaque structure representing an application launch context. +@void: @Returns: diff --git a/docs/reference/gdk/tmpl/gdkdisplay.sgml b/docs/reference/gdk/tmpl/gdkdisplay.sgml index 36e3296be9..19a7798c5f 100644 --- a/docs/reference/gdk/tmpl/gdkdisplay.sgml +++ b/docs/reference/gdk/tmpl/gdkdisplay.sgml @@ -31,6 +31,9 @@ Controls the keyboard/mouse pointer grabs and a set of GdkScreens + + + The GdkDisplay struct is the GDK representation @@ -61,6 +64,7 @@ of an X display. All its fields are private and should not be accessed directly. +@void: @Returns: diff --git a/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml b/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml index a2b65dc3ff..253c5eda61 100644 --- a/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml +++ b/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml @@ -19,6 +19,9 @@ changes. + + + The GdkDisplayManager struct has no interesting @@ -45,6 +48,7 @@ fields. +@void: @Returns: diff --git a/docs/reference/gdk/tmpl/gdkscreen.sgml b/docs/reference/gdk/tmpl/gdkscreen.sgml index 64784c54d4..eeeed17c14 100644 --- a/docs/reference/gdk/tmpl/gdkscreen.sgml +++ b/docs/reference/gdk/tmpl/gdkscreen.sgml @@ -25,6 +25,9 @@ form a large screen area. + + + This is a currently just a placeholder typedef for the first argument of @@ -70,6 +73,7 @@ when GDK gets multihead support. +@void: @Returns: diff --git a/docs/reference/gdk/tmpl/gdktesting.sgml b/docs/reference/gdk/tmpl/gdktesting.sgml index c1ce047ab2..f8e787a4a5 100644 --- a/docs/reference/gdk/tmpl/gdktesting.sgml +++ b/docs/reference/gdk/tmpl/gdktesting.sgml @@ -18,6 +18,9 @@ They allow to simulate some user input. + + + diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml index 41f0c72a03..3278731c8c 100644 --- a/docs/reference/gdk/tmpl/general.sgml +++ b/docs/reference/gdk/tmpl/general.sgml @@ -18,6 +18,9 @@ utility functions. + + + Initializes the GDK library and connects to the X server. @@ -70,6 +73,7 @@ by GTK+ applications. +@void: @Returns: @@ -94,6 +98,7 @@ If the locale is not supported by X then it is reset to the standard "C" locale. +@void: @Returns: the resulting locale. @@ -123,6 +128,7 @@ of g_atexit()). +@void: @@ -141,6 +147,7 @@ commandline option, the default value is the program name (determined with g_get_prgname()) with the first character converted to uppercase. +@void: @Returns: the program class. @@ -160,6 +167,7 @@ Gets the name of the display, which usually comes from the DISPLAY--display command line option. +@void: @Returns: the name of the display. @@ -170,12 +178,14 @@ by the server. This is rarely needed by applications. It's main use is for trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop(). +@void: +@void: @Returns: @@ -183,6 +193,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop(). +@void: @Returns: @@ -190,6 +201,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop(). +@void: @Returns: @@ -197,6 +209,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop(). +@void: @Returns: @@ -279,6 +292,7 @@ success or the reason for the failure of the grab attempt. +@void: @Returns: @@ -324,6 +338,7 @@ available. +@void: @@ -338,6 +353,7 @@ SYSV shared memory calls. However, it can only be used if the X client and server are on the same machine and the server supports it. +@void: @Returns: %TRUE if use of the MIT shared memory extension will be attempted. @@ -375,6 +391,7 @@ avoid the X error in any other way. +@void: @@ -382,6 +399,7 @@ avoid the X error in any other way. Removes the X error trap installed with gdk_error_trap_push(). +@void: @Returns: the X error code, or 0 if no error occurred. diff --git a/docs/reference/gdk/tmpl/images.sgml b/docs/reference/gdk/tmpl/images.sgml index a9a6cd75ef..0973635643 100644 --- a/docs/reference/gdk/tmpl/images.sgml +++ b/docs/reference/gdk/tmpl/images.sgml @@ -57,6 +57,9 @@ displays. + + + The #GdkImage struct contains information on the image and the pixel data. diff --git a/docs/reference/gdk/tmpl/input.sgml b/docs/reference/gdk/tmpl/input.sgml index 0ffe255a89..41377caaa6 100644 --- a/docs/reference/gdk/tmpl/input.sgml +++ b/docs/reference/gdk/tmpl/input.sgml @@ -34,6 +34,9 @@ callbacks. + + + diff --git a/docs/reference/gdk/tmpl/input_devices.sgml b/docs/reference/gdk/tmpl/input_devices.sgml index 4a163fe71a..e31cd9e1c3 100644 --- a/docs/reference/gdk/tmpl/input_devices.sgml +++ b/docs/reference/gdk/tmpl/input_devices.sgml @@ -87,6 +87,9 @@ and ytilt. + + + A GdkDevice structure contains @@ -174,6 +177,7 @@ types that GTK+ understands. +@void: @Returns: @@ -224,6 +228,7 @@ Specifies how an axis of a device is used. +@void: @Returns: diff --git a/docs/reference/gdk/tmpl/keys.sgml b/docs/reference/gdk/tmpl/keys.sgml index 9c67e094cc..dc0083407c 100644 --- a/docs/reference/gdk/tmpl/keys.sgml +++ b/docs/reference/gdk/tmpl/keys.sgml @@ -88,6 +88,9 @@ gdk_keymap_translate_keyboard_state() just to get the keyval. + + + A GdkKeymap defines the translation from keyboard state @@ -143,6 +146,7 @@ be mapped to a keyval. +@void: @Returns: @@ -234,6 +238,15 @@ Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL. @Returns: + + + + + +@keymap: +@state: + + diff --git a/docs/reference/gdk/tmpl/pango_interaction.sgml b/docs/reference/gdk/tmpl/pango_interaction.sgml index b03c4b1df8..b9556a9b7f 100644 --- a/docs/reference/gdk/tmpl/pango_interaction.sgml +++ b/docs/reference/gdk/tmpl/pango_interaction.sgml @@ -132,6 +132,9 @@ g_object_unref (gc); + + + @@ -210,6 +213,7 @@ g_object_unref (gc); +@void: @Returns: diff --git a/docs/reference/gdk/tmpl/pixbufs.sgml b/docs/reference/gdk/tmpl/pixbufs.sgml index 53de271a52..9b1aacf72d 100644 --- a/docs/reference/gdk/tmpl/pixbufs.sgml +++ b/docs/reference/gdk/tmpl/pixbufs.sgml @@ -19,6 +19,9 @@ pixbufs, see the #GdkPixbuf API documentation. + + + @@ -39,6 +42,12 @@ pixbufs, see the #GdkPixbuf API documentation. + + + + + + @pixbuf: @pixmap_return: @mask_return: diff --git a/docs/reference/gdk/tmpl/pixmaps.sgml b/docs/reference/gdk/tmpl/pixmaps.sgml index d64418f7a5..333a2b348c 100644 --- a/docs/reference/gdk/tmpl/pixmaps.sgml +++ b/docs/reference/gdk/tmpl/pixmaps.sgml @@ -21,6 +21,9 @@ pixel can be either on or off). + + + An opaque structure representing an offscreen drawable. @@ -125,3 +128,5 @@ An opaque structure representing an offscreen drawable of depth #GdkWindow, can often be used interchangeably. The type #GdkDrawable refers generically to any of these types. + + diff --git a/docs/reference/gdk/tmpl/properties.sgml b/docs/reference/gdk/tmpl/properties.sgml index 5dc62e6da2..64a1b2d3f7 100644 --- a/docs/reference/gdk/tmpl/properties.sgml +++ b/docs/reference/gdk/tmpl/properties.sgml @@ -45,6 +45,9 @@ data commonly stored in X window properties. + + + An opaque type representing a string as an index into a table diff --git a/docs/reference/gdk/tmpl/regions.sgml b/docs/reference/gdk/tmpl/regions.sgml index c05c2641c3..dfb43a6dd4 100644 --- a/docs/reference/gdk/tmpl/regions.sgml +++ b/docs/reference/gdk/tmpl/regions.sgml @@ -36,6 +36,9 @@ It can be intersected to regions by using gdk_region_spans_intersect_foreach(). + + + Defines the x and y coordinates of a point. @@ -86,6 +89,7 @@ A GdkRegion represents a set of pixels on the screen. +@void: @Returns: diff --git a/docs/reference/gdk/tmpl/rgb.sgml b/docs/reference/gdk/tmpl/rgb.sgml index 857558d71e..a60e73980c 100644 --- a/docs/reference/gdk/tmpl/rgb.sgml +++ b/docs/reference/gdk/tmpl/rgb.sgml @@ -125,6 +125,9 @@ colors. + + + Draws an RGB image in the drawable. This is the core GdkRGB @@ -360,6 +363,7 @@ private colormap. +@void: @Returns: @@ -368,18 +372,10 @@ private colormap. +@void: @Returns: - - -Gets the colormap set by GdkRGB. This colormap and the corresponding -visual should be used when creating windows that will be drawn in by GdkRGB. - - -@Returns: The #GdkColormap set by GdkRGB. - - Determines whether the preferred visual is ditherable. This function may be @@ -388,6 +384,7 @@ dither mode is desired; if the display is not ditherable, it may make sense to gray out or hide the corresponding UI widget. +@void: @Returns: %TRUE if the preferred visual is ditherable. diff --git a/docs/reference/gdk/tmpl/selections.sgml b/docs/reference/gdk/tmpl/selections.sgml index 413bcf3273..1ce9b894ab 100644 --- a/docs/reference/gdk/tmpl/selections.sgml +++ b/docs/reference/gdk/tmpl/selections.sgml @@ -50,6 +50,9 @@ to the X Inter-client Communication Conventions Manual + + + A #GdkAtom representing the PRIMARY selection. diff --git a/docs/reference/gdk/tmpl/threads.sgml b/docs/reference/gdk/tmpl/threads.sgml index 489b41f78e..75a61ee840 100644 --- a/docs/reference/gdk/tmpl/threads.sgml +++ b/docs/reference/gdk/tmpl/threads.sgml @@ -250,6 +250,9 @@ int main (int argc, char *argv[]) + + + This macro marks the beginning of a critical section in which GDK and @@ -275,6 +278,7 @@ begun with #GDK_THREADS_ENTER. +@void: @@ -285,6 +289,7 @@ conditions. Only one thread at a time can be in such a critial section. +@void: @@ -292,6 +297,7 @@ section. Leaves a critical region begun with gdk_threads_enter(). +@void: diff --git a/docs/reference/gdk/tmpl/visuals.sgml b/docs/reference/gdk/tmpl/visuals.sgml index 6738fc3bc5..5531d499f7 100644 --- a/docs/reference/gdk/tmpl/visuals.sgml +++ b/docs/reference/gdk/tmpl/visuals.sgml @@ -54,6 +54,9 @@ then %GDK_VISUAL_STATIC_GRAY. + + + The GdkVisual structure contains information about @@ -171,6 +174,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff. +@void: @Returns: @@ -179,6 +183,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff. +@void: @Returns: @@ -187,6 +192,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff. +@void: @Returns: @@ -195,6 +201,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff. +@void: @Returns: @@ -203,6 +210,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff. +@void: @Returns: diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml index f9c94e01ff..9f621678a0 100644 --- a/docs/reference/gdk/tmpl/windows.sgml +++ b/docs/reference/gdk/tmpl/windows.sgml @@ -209,6 +209,9 @@ gdk_offscreen_window_get_pixmap(). + + + An opaque structure representing an onscreen drawable. @@ -984,7 +987,7 @@ Registers a window as a potential drop destination. @window: @region: -@child_func: +@GdkWindow *, gpointer: @user_data: @@ -1018,6 +1021,7 @@ Registers a window as a potential drop destination. +@void: @@ -1745,6 +1749,7 @@ The hint must be set before mapping the window. +@void: @Returns: @@ -1753,6 +1758,7 @@ The hint must be set before mapping the window. +@void: @Returns: diff --git a/docs/reference/gdk/tmpl/x_interaction.sgml b/docs/reference/gdk/tmpl/x_interaction.sgml index 2af1f6845d..66a5a07172 100644 --- a/docs/reference/gdk/tmpl/x_interaction.sgml +++ b/docs/reference/gdk/tmpl/x_interaction.sgml @@ -17,6 +17,9 @@ X backend-specific functions + + + Obtains the Xlib window id of the root window of the current screen. @@ -657,6 +660,7 @@ Since: 2.2 +@void: @Returns: @@ -665,6 +669,7 @@ Since: 2.2 +@void: @Returns: @@ -673,6 +678,7 @@ Since: 2.2 +@void: @Returns: @@ -681,6 +687,7 @@ Since: 2.2 +@void: @@ -724,6 +731,7 @@ Since: 2.2 +@void: diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 9495989a75..93b66fce83 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -10,7 +10,7 @@ DOC_MODULE=gtk DOC_MAIN_SGML_FILE=gtk-docs.sgml # Extra options to supply to gtkdoc-scan -SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED" +SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED" # The directory containing the source code. Relative to $(srcdir) DOC_SOURCE_DIR=../../../gtk @@ -149,9 +149,9 @@ content_files = \ tree_widget.sgml \ windows.sgml \ x11.sgml \ - gtk-query-immodules-2.0.xml \ - gtk-update-icon-cache.xml \ - gtk-builder-convert.xml \ + gtk-query-immodules-3.0.xml \ + gtk-update-icon-cache-3.0.xml \ + gtk-builder-convert-3.0.xml \ visual_index.xml expand_content_files = \ @@ -367,9 +367,12 @@ EXTRA_DIST += version.xml.in if ENABLE_MAN -man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1 +man_MANS = \ + gtk-query-immodules-3.0.1 \ + gtk-update-icon-cache-3.0.1 \ + gtk-builder-convert-3.0.1 -%.1 : %.xml +%.1 : %.xml @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< BUILT_EXTRA_DIST = $(man_MANS) diff --git a/docs/reference/gtk/gtk-builder-convert.xml b/docs/reference/gtk/gtk-builder-convert-3.0.xml similarity index 86% rename from docs/reference/gtk/gtk-builder-convert.xml rename to docs/reference/gtk/gtk-builder-convert-3.0.xml index e0b6e1c30d..eccfe336f3 100644 --- a/docs/reference/gtk/gtk-builder-convert.xml +++ b/docs/reference/gtk/gtk-builder-convert-3.0.xml @@ -1,18 +1,18 @@ -gtk-builder-convert +gtk-builder-convert-3.0 1 -gtk-builder-convert +gtk-builder-convert-3.0 Glade file conversion utility -gtk-builder-convert +gtk-builder-convert-3.0 --skip-windows --root name input @@ -21,7 +21,7 @@ Description -gtk-builder-convert converts glade files +gtk-builder-convert-3.0 converts glade files into XML files which can be loaded with GtkBuilder. diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index 251332cd37..7fc18df956 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -425,9 +425,9 @@ that is, GUI components such as #GtkButton or #GtkTextView. GTK+ Tools - - - + + + diff --git a/docs/reference/gtk/gtk-query-immodules-2.0.xml b/docs/reference/gtk/gtk-query-immodules-3.0.xml similarity index 71% rename from docs/reference/gtk/gtk-query-immodules-2.0.xml rename to docs/reference/gtk/gtk-query-immodules-3.0.xml index 1db0d7085a..03510d2266 100644 --- a/docs/reference/gtk/gtk-query-immodules-2.0.xml +++ b/docs/reference/gtk/gtk-query-immodules-3.0.xml @@ -2,33 +2,33 @@ - + -gtk-query-immodules-2.0 +gtk-query-immodules-3.0 1 -gtk-query-immodules-2.0 +gtk-query-immodules-3.0 Input method module registration utility -gtk-query-immodules-2.0 +gtk-query-immodules-3.0 module Description -gtk-query-immodules-2.0 collects information about loadable -input method modules for GTK+ and writes it to stdout. +gtk-query-immodules-3.0 collects information about loadable +input method modules for GTK+ and writes it to stdout. -If called without arguments, it looks for modules in the GTK+ input method -module path. +If called without arguments, it looks for modules in the GTK+ input method +module path. If called with arguments, it looks for the specified modules. The arguments @@ -38,8 +38,8 @@ may be absolute or relative paths. Environment -The environment variable GTK_PATH can -be used to prepend directories to the input method module path. +The environment variable GTK_PATH +can be used to prepend directories to the input method module path. diff --git a/docs/reference/gtk/gtk-update-icon-cache.xml b/docs/reference/gtk/gtk-update-icon-cache-3.0.xml similarity index 60% rename from docs/reference/gtk/gtk-update-icon-cache.xml rename to docs/reference/gtk/gtk-update-icon-cache-3.0.xml index 4d3f4a8a83..477f37c381 100644 --- a/docs/reference/gtk/gtk-update-icon-cache.xml +++ b/docs/reference/gtk/gtk-update-icon-cache-3.0.xml @@ -5,18 +5,18 @@ -gtk-update-icon-cache +gtk-update-icon-cache-3.0 1 -gtk-update-icon-cache +gtk-update-icon-cache-3.0 Icon theme caching utility -gtk-update-icon-cache +gtk-update-icon-cache-3.0 --force --ignore-theme-index --index-only @@ -28,20 +28,22 @@ Description -gtk-update-icon-cache creates mmap()able cache files for -icon themes. + + gtk-update-icon-cache-3.0 creates mmap()able cache + files for icon themes. -It expects to be given the path to a icon theme directory containing an -index.theme, e.g. /usr/share/icons/hicolor, -and writes a icon-theme.cache containing cached information -about the icons in the directory tree below the given directory. + It expects to be given the path to a icon theme directory containing an + index.theme, e.g. /usr/share/icons/hicolor, + and writes a icon-theme.cache containing cached + information about the icons in the directory tree below the given directory. -GTK+ can use the cache files created by gtk-update-icon-cache -to avoid a lot of system call and disk seek overhead when the application starts. -Since the format of the cache files allows them to be mmap()ed shared between -multiple applications, the overall memory consumption is reduced as well. + GTK+ can use the cache files created by gtk-update-icon-cache-3.0 + to avoid a lot of system call and disk seek overhead when the application + starts. Since the format of the cache files allows them to be mmap()ed + shared between multiple applications, the overall memory consumption is + reduced as well. @@ -50,17 +52,17 @@ multiple applications, the overall memory consumption is reduced as well. --force -f - Overwrite an existing cache file even if it appears to be + Overwrite an existing cache file even if it appears to be uptodate. --ignore-theme-index -t - Don't check for the existence of 'index.theme' in the icon theme - directory. Without this option, gtk-update-icon-cache refuses - to create an icon cache in a directory which does not appear to be the toplevel - directory of an icon theme. + Don't check for the existence of 'index.theme' in the icon + theme directory. Without this option, gtk-update-icon-cache-3.0 + refuses to create an icon cache in a directory which does not appear to + be the toplevel directory of an icon theme. @@ -74,15 +76,15 @@ multiple applications, the overall memory consumption is reduced as well. --source -c - Output a C header file declaring a constant - name with the contents of the icon + Output a C header file declaring a constant + name with the contents of the icon cache. --quiet -q - Turn off verbose output. + Turn off verbose output. diff --git a/docs/reference/gtk/question_index.sgml b/docs/reference/gtk/question_index.sgml index 771e7c94cb..225d564479 100644 --- a/docs/reference/gtk/question_index.sgml +++ b/docs/reference/gtk/question_index.sgml @@ -2,7 +2,7 @@ - + Common Questions 3 diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml index add364f173..ee7c0e1698 100644 --- a/docs/reference/gtk/running.sgml +++ b/docs/reference/gtk/running.sgml @@ -2,7 +2,7 @@ - + Running GTK+ Applications 3 @@ -24,8 +24,8 @@ How to run and debug your GTK+ application All GTK+ applications support a number of standard commandline -options. These are removed from argv by gtk_init(). -Modules may parse and remove further options. The +options. These are removed from argv by gtk_init(). +Modules may parse and remove further options. The X11 and Windows GDK backends parse some additional commandline options. @@ -35,8 +35,8 @@ some additional commandline options. <systemitem>--gtk-module <replaceable>module</replaceable></systemitem> -A list of modules to load in addition to those specified in the -GTK_MODULES environment variable and the +A list of modules to load in addition to those specified in the +GTK_MODULES environment variable and the gtk-modules setting. @@ -56,11 +56,10 @@ warning that occurs. <systemitem>--gtk-debug <replaceable>options</replaceable></systemitem> -A list of debug options -to turn on in addition to those specified in the GTK_DEBUG -environment variable. -This option is only available if GTK+ has been configured with -. +A list of debug options +to turn on in addition to those specified in the GTK_DEBUG +environment variable. This option is only available if GTK+ has been +configured with . @@ -68,9 +67,8 @@ This option is only available if GTK+ has been configured with <systemitem>--gtk-no-debug <replaceable>options</replaceable></systemitem> -A list of debug options -to turn off. -This option is only available if GTK+ has been configured with +A list of debug options +to turn off. This option is only available if GTK+ has been configured with . @@ -84,7 +82,7 @@ list them here for completeness nevertheless. <systemitem>--class <replaceable>class</replaceable></systemitem> -Sets the program class; see gdk_set_program_class(). +Sets the program class; see gdk_set_program_class(). @@ -100,9 +98,9 @@ Sets the program name. <systemitem>--gdk-debug <replaceable>options</replaceable></systemitem> -A list of debug options -to turn on in addition to those specified in the GDK_DEBUG -environment variable. This option is only available if GTK+ has been +A list of debug options +to turn on in addition to those specified in the GDK_DEBUG +environment variable. This option is only available if GTK+ has been configured with . @@ -111,7 +109,7 @@ configured with . <systemitem>--gdk-no-debug <replaceable>options</replaceable></systemitem> -A list of debug options +A list of debug options to turn off. This option is only available if GTK+ has been configured with . @@ -122,12 +120,12 @@ to turn off. This option is only available if GTK+ has been configured with Environment variables - + GTK+ inspects a number of environment variables in addition to standard -variables like LANG, PATH, HOME -or DISPLAY; mostly to determine paths to look for certain -files. The X11, -Windows and +variables like LANG, PATH, HOME +or DISPLAY; mostly to determine paths to look for certain +files. The X11, +Windows and Framebuffer GDK backends use some additional environment variables. @@ -190,7 +188,7 @@ additional environment variables. - The special value all can be used to turn on all + The special value all can be used to turn on all debug options. @@ -210,14 +208,14 @@ additional environment variables. Specifies a list of directories to search when GTK+ is looking for dynamically loaded objects such as the modules specified by GTK_MODULES, theme engines, input method - modules, file system backends and print backends. If the path to - the dynamically loaded object is given as an absolute path name, - then GTK+ loads it directly. - Otherwise, GTK+ goes in turn through the directories in GTK_PATH, - followed by the directory .gtk-2.0 in the user's - home directory, followed by the system default directory, - which is libdir/gtk-2.0/modules. - (If GTK_EXE_PREFIX is defined, libdir is + modules, file system backends and print backends. If the path to + the dynamically loaded object is given as an absolute path name, + then GTK+ loads it directly. + Otherwise, GTK+ goes in turn through the directories in GTK_PATH, + followed by the directory .gtk-3.0 in the user's + home directory, followed by the system default directory, + which is libdir/gtk-3.0/modules. + (If GTK_EXE_PREFIX is defined, libdir is $GTK_EXE_PREFIX/lib. Otherwise it is the libdir specified when GTK+ was configured, usually /usr/lib, or @@ -227,14 +225,14 @@ additional environment variables. directory/version/host/type Where version is derived from the version of GTK+ (use pkg-config - --variable=gtk_binary_version gtk+-2.0 to determine this from a + --variable=gtk_binary_version gtk+-3.0 to determine this from a script), host is the architecture on which GTK+ was built. (use pkg-config - --variable=gtk_host gtk+-2.0 to determine this from a + --variable=gtk_host gtk+-3.0 to determine this from a script), and type is a directory specific to the type of modules; currently it can be - modules, engines, - immodules, filesystems or + modules, engines, + immodules, filesystems or printbackends, corresponding to the types of modules mentioned above. Either version, host, or both may be omitted. GTK+ looks @@ -262,17 +260,17 @@ additional environment variables. Specifies the file listing the IM modules to load. This environment - variable overrides the im_module_file specified in - the RC files, which in turn overrides the default value - sysconfdir/gtk-2.0/gtk.immodules - (sysconfdir is the sysconfdir specified when GTK+ was configured, + variable overrides the im_module_file specified in + the RC files, which in turn overrides the default value + sysconfdir/gtk-3.0/gtk.immodules + (sysconfdir is the sysconfdir specified when GTK+ was configured, usually /usr/local/etc.) <envar>GTK2_RC_FILES</envar> - + Specifies a list of RC files to parse instead of the default ones; see Resource Files. @@ -283,7 +281,7 @@ additional environment variables. <envar>GTK_EXE_PREFIX</envar> - If set, GTK+ uses $GTK_EXE_PREFIX/lib instead of + If set, GTK+ uses $GTK_EXE_PREFIX/lib instead of the libdir configured when GTK+ was compiled. @@ -307,9 +305,9 @@ nevertheless. <envar>GDK_PIXBUF_MODULE_FILE</envar> - Specifies the file listing the GdkPixbuf loader modules to load. - This environment variable overrides the default value - sysconfdir/gtk-2.0/gdk-pixbuf.loaders + Specifies the file listing the GdkPixbuf loader modules to load. + This environment variable overrides the default value + sysconfdir/gtk-3.0/gdk-pixbuf.loaders (sysconfdir is the sysconfdir specified when GTK+ was configured, usually /usr/local/etc.) @@ -385,9 +383,9 @@ nevertheless. GTK+ uses these environment variables to locate icon themes - and MIME information. For more information, see + and MIME information. For more information, see Icon Theme Specification, - the Shared MIME-info Database + the Shared MIME-info Database and the Base Directory Specification. diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 70f0e6bab7..21b713a155 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -65,6 +65,129 @@ Implementation of Object Properties GtkCellRendererTextPixbuf + + +The #GtkCList widget is a very useful multi-columned scrolling list. +It can display data in nicely aligned vertical columns, with titles +at the top of the list. + + +GtkCList has been deprecated since GTK+ 2.0 and should not be used +in newly written code. Use #GtkTreeView instead. + + + + + + + + + + +A multi-columned scrolling list widget + + + + + + + +GtkCList + + + + +The #GtkCombo widget consists of a single-line text entry field and a drop-down +list. The drop-down list is displayed when the user clicks on a small arrow +button to the right of the entry field. + + +The drop-down list is a #GtkList widget and can be accessed using the +list member of the #GtkCombo-struct. +List elements can contain arbitrary widgets, but if an element is not a +plain label, then you must use the gtk_list_set_item_string() function. +This sets the string which will be placed in the text entry field when the +item is selected. + + +By default, the user can step through the items in the list using the +arrow (cursor) keys, though this behaviour can be turned off with +gtk_combo_set_use_arrows(). + + +As of GTK+ 2.4, #GtkCombo has been deprecated in favor of #GtkComboBoxEntry. + + + +Creating a <structname>GtkCombo</structname> widget with simple text +items. + + GtkWidget *combo; + GList *items = NULL; + + items = g_list_append (items, "First Item"); + items = g_list_append (items, "Second Item"); + items = g_list_append (items, "Third Item"); + items = g_list_append (items, "Fourth Item"); + items = g_list_append (items, "Fifth Item"); + + combo = gtk_combo_new (); + gtk_combo_set_popdown_strings (GTK_COMBO (combo), items); + + + + +Creating a <structname>GtkCombo</structname> widget with a complex item. + + GtkWidget *combo, *item, *hbox, *arrow, *label; + + combo = gtk_combo_new (); + + item = gtk_list_item_new (); + gtk_widget_show (item); + + /* You can put almost anything into the GtkListItem widget. Here we will use + a horizontal box with an arrow and a label in it. */ + hbox = gtk_hbox_new (FALSE, 3); + gtk_container_add (GTK_CONTAINER (item), hbox); + gtk_widget_show (hbox); + + arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_OUT); + gtk_widget_show (arrow); + gtk_box_pack_start (GTK_BOX (hbox), arrow, FALSE, FALSE, 0); + + label = gtk_label_new ("First Item"); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + + /* You must set the string to display in the entry field when the item is + selected. */ + gtk_combo_set_item_string (GTK_COMBO (combo), GTK_ITEM (item), "1st Item"); + + /* Now we simply add the item to the combo's list. */ + gtk_container_add (GTK_CONTAINER (GTK_COMBO (combo)->list), item); + + + + + + + + + + + +A text entry field with a dropdown list + + + + + + + +GtkCombo + + The #GtkData object is a very simple object intended to be used as a base @@ -101,6 +224,210 @@ Debugging gtkenums.sgml + + +#GtkFileSelection has been superseded by the newer #GtkFileChooser family +of widgets. + + +#GtkFileSelection should be used to retrieve file or directory names from +the user. It will create a new dialog window containing a directory list, +and a file list corresponding to the current working directory. The filesystem +can be navigated using the directory list or the drop-down history menu. +Alternatively, the TAB key can be used to navigate using filename +completion - common in text based editors such as emacs and jed. + + +File selection dialogs are created with a call to gtk_file_selection_new(). + + +The default filename can be set using gtk_file_selection_set_filename() and the selected filename retrieved using gtk_file_selection_get_filename(). + + +Use gtk_file_selection_complete() to display files and directories +that match a given pattern. This can be used for example, to show only +*.txt files, or only files beginning with gtk*. + + +Simple file operations; create directory, delete file, and rename file, are available from buttons at the top of the dialog. These can be hidden using gtk_file_selection_hide_fileop_buttons() and shown again using gtk_file_selection_show_fileop_buttons(). + + + +Getting a filename from the user. + + +/* The file selection widget and the string to store the chosen filename */ + +void store_filename (GtkWidget *widget, gpointer user_data) { + GtkWidget *file_selector = GTK_WIDGET (user_data); + const gchar *selected_filename; + + selected_filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (file_selector)); + g_print ("Selected filename: %s\n", selected_filename); +} + +void create_file_selection (void) { + + GtkWidget *file_selector; + + /* Create the selector */ + + file_selector = gtk_file_selection_new ("Please select a file for editing."); + + g_signal_connect (GTK_FILE_SELECTION (file_selector)->ok_button, + "clicked", + G_CALLBACK (store_filename), + file_selector); + + /* Ensure that the dialog box is destroyed when the user clicks a button. */ + + g_signal_connect_swapped (GTK_FILE_SELECTION (file_selector)->ok_button, + "clicked", + G_CALLBACK (gtk_widget_destroy), + file_selector); + + g_signal_connect_swapped (GTK_FILE_SELECTION (file_selector)->cancel_button, + "clicked", + G_CALLBACK (gtk_widget_destroy), + file_selector); + + /* Display that dialog */ + + gtk_widget_show (file_selector); +} + + + + + + + + + + + +#GtkDialog +Add your own widgets into the #GtkFileSelection. + + + + + + +Prompt the user for a file or directory name + + + + + + + +GtkFileSelection + + + + +As of GTK+ 2.4, #GtkItemFactory has been deprecated in favour of #GtkUIManager. + + + + + + + + + + +A factory for menus + + + + + + + +GtkItemFactory + + + + +The #GtkList widget is a container whose children are displayed +vertically in order, and can be selected. + +The list has many selection modes, which are programmer selective and +depend on how many elements are able to be selected at the same time. + + +GtkList has been deprecated since GTK+ 2.0 and should not be used +in newly written code. Use #GtkTreeView instead. + + + + + + + +#GtkContainer +For functions that apply to every #GtkContainer +(like #GtkList). + + +#GtkListitem +Children of a #GtkList widget must be of this +type. + + + + + + +Widget for packing a list of selectable items + + + + + + + +GtkList + + + + +The #GtkListItem widget is used for each item in a #GtkList. + + +GtkList has has been deprecated since GTK+ 2.0 and should not be used +in newly written code. Use #GtkTreeView instead. + + + + + + + + +#GtkList +the parent list widget. + + + + + + + + +An item in a GtkList + + + + + + + +GtkListItem + + What are Signal Marshallers? @@ -209,6 +536,41 @@ Signal Marshallers GtkPacker + + +The #GtkPreview widget provides a simple interface +used to display images as RGB or grayscale data. +It's deprecated; just use a #GdkPixbuf displayed by a #GtkImage, or +perhaps a #GtkDrawingArea. #GtkPreview has no advantage over those +approaches. + + + + + + + + +#GdkRGB +the backend used by #GtkPreview. + + + + + + + +A widget to display RGB or grayscale data + + + + + + + +GtkPreview + + Private Information @@ -237,3177 +599,7322 @@ Private Information Themes - + - +The #GtkTipsQuery widget is a subclass of #GtkLabel which is used to display +help about widgets in a user interface. + + +A query is started with a call to gtk_tips_query_start_query(), usually +when some kind of 'Help' button is pressed. The #GtkTipsQuery then grabs all +events, stopping the user interface from functioning normally. +Then as the user moves the mouse over the widgets, the #GtkTipsQuery displays +each widget's tooltip text. + + +By connecting to the "widget-entered" or "widget-selected" signals, it is +possible to customize the #GtkTipsQuery to perform other actions when widgets +are entered or selected. For example, a help browser could be opened with +documentation on the widget selected. + + +At some point a call to gtk_tips_query_stop_query() must be made in order to +stop the query and return the interface to its normal state. +The gtk_tips_query_set_caller() function can be used to specify a widget +which the user can select to stop the query (often the same button used to +start the query). - + - + + +#GtkTooltips +the object which handles tooltips. + + - + +Displays help about widgets in the user interface + - -GtkModelSimple - - -A macro to check whether a child widget of the CList -has the focus. - + +GtkTipsQuery -@clist: The #GtkCList widget to check. - + - + - - - - + - - - + +GtkModelSimple - + - +A macro to cast a generic #GtkCList cell item to a GtkCellPixmap pointer. +@cell: The #GtkCList cell item to convert. - + - +A macro to cast a generic #GtkCList cell item to a GtkCellPixText pointer. -@obj: +@cell: The #GtkCList cell item to convert. - + - +A macro to cast a generic #GtkCList cell item to a GtkCellText pointer. -@klass: +@cell: The #GtkCList cell item to convert. - + -Tests whether a #GtkObject has had a signal connected to it. +A macro to cast a generic #GtkCList cell item to a GtkCellWidget pointer. -@obj: the object to examine. +@cell: The #GtkCList cell item to convert. - + -Test whether a GtkObject's arguments have been prepared. +Casts the object in @tobj into @cast. If %G_DISABLE_CAST_CHECKS is +defined, just cast it. Otherwise, check to see if we can cast @tobj +into a @cast. -@obj: the object to examine. - + -Test whether a GtkObject has had gtk_object_destroy() invoked on it. +Casts the object in @tobj into @cast. If %G_DISABLE_CAST_CHECKS is +defined, just cast it. Otherwise, check to see if we can cast @tobj +into a @cast. -@obj: the object to examine. +@tclass: a #GtkClassInitFunc +@cast_type: a GTK+ type. +@cast: a C type - + -Get the number of signals defined by this object. +Determines whether @type_class is a type of @otype. -@obj: the object to query. +@type_class: a #GtkTypeClass class. - + -Turns on certain object flags. (Private) +Gets the class of @tobj. -@obj: the object to affect. -@flag: the flags to set. +@tobj: a #GtkObject. - + -Get the array of signals defined for this object. +Determines whether @type_object is a type of @otype. -@obj: the object to fetch the signals from. +@type_object: a #GtkTypeObject object - + -Turns off certain object flags. (Private) +Returns the type name of @class. -@obj: the object to affect. -@flag: the flags to unset. +@class: a #GtkTypeClass. +@Deprecated: Use g_type_name() and G_TYPE_FROM_CLASS() instead. - + - +Returns the type of @class. +@class: a #GtkTypeClass. +@Deprecated: Use G_TYPE_FROM_CLASS() instead. - + - +A macro to test whether the CList is in "add mode." +@clist: The #GtkCList widget to check. - + - +A macro to check if automatic resizing of columns is blocked. +@clist: The #GtkCList widget to check. - + - +A macro to test whether the CList has automatic sorting +switched on. +@clist: The #GtkCList widget to check. - + - +A macro to check whether a child widget of the CList +has the focus. +@clist: The #GtkCList widget to check. - + - +A macro to check if the DRAW_DRAG_LINE property is enabled. +@clist: The #GtkCList widget to check. - + - +A macro to check if the DRAW_DRAG_RECT property is enabled. +@clist: The #GtkCList widget to check. - + - +Reads the current flags of the specified CList. +@clist: The #GtkCList widget from which to get the flags - + - +A macro to check whether the #GtkCList is in "drag mode." -@obj: +@clist: The #GtkCList to check. - + - +A macro to test if the CList's columns are re-orderable -@klass: +@clist: The #GtkCList widget to check. - + - +A macro to cast a GList element to a CListRow pointer. -@obj: +@_glist_: The GList element to convert. - + - +A macro to check whether the #GtkCList's row height is set. -@obj: +@clist: The #GtkCList to check. - + -A macro that returns a GList that contains the selection of the root tree of @obj. +A macro to set a particular flag for the specified CList. -@obj: A pointer to the #GtkTree. @obj will accept any pointer, but it the pointer does not point to a #GtkTree, the results are undefined. +@clist: The #GtkCList widget to affect. +@flag: A single #GtkCList flag to set. NOTE: Do not add the GTK_ prefix. - + -The first "flat" (no struct) enumerated type value. +A macro to check whether the flag for showing the +widget's column titles is set. +@clist: The #GtkCList widget to check. - + -The last "flat" (no struct) enumerated type value. +A macro to clear a particular flag for the specified CList. +@clist: The #GtkCList widget to affect. +@flag: A single #GtkCList flag to clear. NOTE: Do not add the GTK_ prefix. - + -Hide the name of gtk_identifier_get_type +A macro to check if the USE_DRAG_ICONS property is enabled. +@clist: The #GtkCList widget to check. - + -Combine a fundemantal type and a sequence number to create a gtk type. +Converts a GTK+ type into a fundamental type. -@parent_t: -@seqno: - + -No idea. + - + -Convert a gtk type into its sequence number + -@type: - + -The first structured enumerated type value. + - + -The last structured enumerated type value. + - + - + +@obj: - + +@klass: - + -Use to get the value of a GtkArg whose GtkType is GTK_TYPE_ARGS +Tests whether a #GtkObject has had a signal connected to it. -@a: +@obj: the object to examine. - + -Use to get the value of a GtkArg whose GtkType is GTK_TYPE_CALLBACK +Test whether a GtkObject's arguments have been prepared. -@a: +@obj: the object to examine. - + -Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_CALLBACK +Test whether a GtkObject has had gtk_object_destroy() invoked on it. -@a: +@obj: the object to examine. - + -Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN +Evaluates to %TRUE if the object still has its floating reference count. +See the overview documentation for #GtkObject. -@a: +@obj: the object to examine. - + - +Get the number of signals defined by this object. -@a: -@b: -@Returns: +@obj: the object to query. - + - +Turns on certain object flags. (Private) +@obj: the object to affect. +@flag: the flags to set. - + - +Get the array of signals defined for this object. +@obj: the object to fetch the signals from. - + -This is a private struct used by GTK+ internally, don't worry about it. +Turns off certain object flags. (Private) -@accel_group: -@accelerator_key: -@accelerator_mods: -@accel_flags: -@object: -@signal_id: +@obj: the object to affect. +@flag: the flags to unset. - + - + - + - +If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_BOOL. -@data: -@accel_path_quark: -@accel_key: -@accel_mods: -@accel_group: -@old_accel_key: -@old_accel_mods: +@a: a #GtkArg. - + - +If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_BOXED. -@action: the object which received the signal. -@widget: +@a: a #GtkArg. - + - +If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_CHAR. -@action: the object which received the signal. -@widget: +@a: a #GtkArg. - + -Define a function pointer. Deprecated. +If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_DOUBLE. -@object: -@arg: -@arg_id: +@a: a #GtkArg. - + -A structure containing information about the argument. -Returned by gtk_arg_get_info(). +If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_ENUM. -@class_type: if the argument is an object, this is the object class type. -@name: the name of the argument. -@type: the type of the argument; it may be an object's type -or a fundamental type. -@arg_flags: flags applicable to the argument (i.e. readable, writable, -and whether it needs to be constructed). -@full_name: the object name and argument name separated by ::, -e.g. "GtkObject::user_data" or "GtkButton::label". -@arg_id: the unique argument identified. -@seq_id: ??? +@a: a #GtkArg. - + -Define a function pointer. Deprecated. +If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_FLAGS. -@object: -@arg: -@arg_id: +@a: a #GtkArg. - + - +If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_FLOAT. -@get_type_from_name: Looks up a type by name. The default - implementation applies heuristics to map type names to - _get_type function names, e.g. - GtkHBox to gtk_hbox_get_type(). This virtual function - is provided to allow language bindings to intercept the - type resolution process. +@a: a #GtkArg. - + - +If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_INT. -@parent: +@a: a #GtkArg. - + +If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_LONG. + + +@a: a #GtkArg. + + +If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_OBJECT. +@a: a #GtkArg. - + +If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_POINTER. + + +@a: a #GtkArg. + + +If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_STRING. +@a: a #GtkArg. - + +If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_UCHAR. + + +@a: a #GtkArg. + + +If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_UINT. +@a: a #GtkArg. - + +If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_ULONG. + + +@a: a #GtkArg. + + +Just a macroized cast into a #GtkSignalFunc. -@combobox: the object which received the signal. +@f: - + -@combobox: the object which received the signal. - + - + - + -@container: the object which received the signal. -@direction: -@Returns: - + - + -The #GtkData-struct struct contains no public fields. + - + -Emitted to notify any views on the #GtkData object to disconnect from it, -possibly because the #GtkData object is about to be destroyed. +Use in place of offsetof(), which is used if it exists. -@data: the object which received the signal. +@Deprecated: Use G_STRUCT_OFFSET() instead. - + -Indicates that the user has activated the widget -in some fashion. Generally, this will be done -with a keystroke. (The default binding for this -action is Return for #GtkEntry and -Control-Return for #GtkText.) + -@editable: the object which received the signal. +@obj: - + -An action signal. Causes the characters in the current selection to -be copied to the clipboard. + -@editable: the object which received the signal. +@klass: - + -An action signal. Causes the characters in the current -selection to be copied to the clipboard and then deleted from -the widget. + -@editable: the object which received the signal. +@obj: - + -An action signal. Delete a single character. + -@editable: the object which received the signal. -@direction: the direction in which to delete. Positive - indicates forward deletion, negative, backwards deletion. +@obj: - + -An action signal. Delete a single line. +A macro that returns a GList that contains the selection of the root tree of @obj. -@editable: the object which received the signal. -@direction: the direction in which to delete. Positive - indicates forward deletion, negative, backwards deletion. +@obj: A pointer to the #GtkTree. @obj will accept any pointer, but it the pointer does not point to a #GtkTree, the results are undefined. - + -An action signal. Delete a single word. +The first "flat" (no struct) enumerated type value. -@editable: the object which received the signal. -@direction: the direction in which to delete. Positive - indicates forward deletion, negative, backwards deletion. - + -An action signal. Move the cursor position. +The last "flat" (no struct) enumerated type value. -@editable: the object which received the signal. -@x: horizontal distance to move the cursor. -@y: vertical distance to move the cursor. - + -An action signal. Move the cursor by pages. +The highest-numbered structured or flat enumerated type value. -@editable: the object which received the signal. -@x: Number of pages to move the cursor horizontally. -@y: Number of pages to move the cursor vertically. +@Deprecated: Use #G_TYPE_LAST_RESERVED_FUNDAMENTAL - 1 instead. - + -An action signal. Move the cursor to the given column. +The maximum fundamental enumerated type value. -@editable: the object which received the signal. -@column: the column to move to. (A negative value indicates - the last column) +@Deprecated: Use #G_TYPE_FUNDAMENTAL_MAX instead. - + -An action signal. Move the cursor to the given row. +Hide the name of gtk_identifier_get_type -@editable: the object which received the signal. -@row: the row to move to. (A negative value indicates - the last row) - + -An action signal. Move the cursor by words. +Returns %TRUE if @type is a %GTK_TYPE_OBJECT. -@editable: the object which received the signal. -@num_words: The number of words to move the -cursor. (Can be negative). +@type: a #GtkType. +@Deprecated: Use G_TYPE_IS_OBJECT() instead. - + -An action signal. Causes the contents of the clipboard to -be pasted into the editable widget at the current cursor -position. +Combine a fundemantal type and a sequence number to create a gtk type. -@editable: the object which received the signal. +@parent_t: +@seqno: - + -Determines if the user can edit the text in the editable -widget or not. This is meant to be overriden by -child classes and should not generally useful to -applications. +No idea. -@editable: the object which received the signal. -@is_editable: %TRUE if the user is allowed to edit the text - in the widget. - + -A boolean indicating whether the widget is editable by -the user. +Convert a gtk type into its sequence number +@type: - + -The position of the cursor. +The first structured enumerated type value. - - -A simple function pointer to get invoked when the -signal is emitted. This allows you tie a hook to the signal type, -so that it will trap all emissions of that signal, from any object. - + -You may not attach these to signals created with the -#GTK_RUN_NO_HOOKS flag. +The last structured enumerated type value. -@object: -@signal_id: -@n_params: -@params: -@data: -@Returns: - + -@entry: the object which received the signal. - + -@entry: the object which received the signal. -@arg1: -@arg2: - + -@entry: the object which received the signal. -@arg1: -@event: - + - +Use to get the value of a GtkArg whose GtkType is GTK_TYPE_ARGS -@entry: the object which received the signal. -@arg1: -@event: +@a: - + - +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_BOOL. -@entry: the object which received the signal. -@arg1: -@arg2: -@arg3: +@a: a #GtkArg. - + - +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_BOXED. +@a: a #GtkArg. - + - +Use to get the value of a GtkArg whose GtkType is GTK_TYPE_CALLBACK +@a: - + - +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_CHAR. +@a: a #GtkArg. - + - +Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_CALLBACK +@a: - + - +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_DOUBLE. +@a: a #GtkArg. - + - +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_ENUM. +@a: a #GtkArg. - + - +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_FLAGS. +@a: a #GtkArg. - + - +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_FLOAT. +@a: a #GtkArg. - + - +Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN +@a: - + - +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_INT. +@a: a #GtkArg. - + - +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_LONG. +@a: a #GtkArg. - + - +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_OBJECT. +@a: a #GtkArg. - + - +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_POINTER. +@a: a #GtkArg. - + - +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_SIGNAL. +@a: a #GtkArg. - + - +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_STRING. +@a: a #GtkArg. - + - +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_UCHAR. +@a: a #GtkArg. - + +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_UINT. + +@a: a #GtkArg. + + + +Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_ULONG. -@parent_class: -@inserted_text: -@deleted_text: -@get_text: -@get_length: -@insert_text: -@delete_text: -@_gtk_reserved0: -@_gtk_reserved1: -@_gtk_reserved2: -@_gtk_reserved3: -@_gtk_reserved4: -@_gtk_reserved5: +@a: a #GtkArg. - + +@a: +@b: +@Returns: - + -The #GtkFixedChild-struct struct contains the following fields. -(These fields should be considered read-only. They should never be set by -an application.) - - - + - -#GtkWidget *widget; -the child #GtkWidget. - - -#gint x; -the horizontal position of the widget within the #GtkFixed -container. - + + - -#gint y; -the vertical position of the widget within the #GtkFixed -container. - + - + + + +This is a private struct used by GTK+ internally, don't worry about it. -@widget: -@x: -@y: +@accel_group: +@accelerator_key: +@accelerator_mods: +@accel_flags: +@object: +@signal_id: - + -A set of bit flags used to specify the filter being set -when calling gtk_font_selection_dialog_set_filter() or -gtk_font_selection_set_filter(). + -@GTK_FONT_FILTER_BASE: the base filter, which can't be changed by the user. -@GTK_FONT_FILTER_USER: the user filter, which can be changed from within the -'Filter' page of the #GtkFontSelection widget. - + -A set of bit flags used to specify the type of fonts shown -when calling gtk_font_selection_dialog_set_filter() or -gtk_font_selection_set_filter(). + -@GTK_FONT_BITMAP: bitmap fonts. -@GTK_FONT_SCALABLE: scalable fonts. -@GTK_FONT_SCALABLE_BITMAP: scaled bitmap fonts. -@GTK_FONT_ALL: a bitwise combination of all of the above. - + -the #GtkAdjustment which sets the range of the scale. + +@data: +@accel_path_quark: +@accel_key: +@accel_mods: +@accel_group: +@old_accel_key: +@old_accel_mods: - + +@action: the object which received the signal. +@widget: - + +@action: the object which received the signal. +@widget: - + -A GtkImageLoader is used to load a filename found in -a RC file. +Possible flags indicating how an argument should be treated. -@window: the window for creating image -@colormap: the colormap for this image -@mask: a pointer to the location to store the mask -@transparent_color: the transparent color for the image -@filename: filename to load -@Returns: a #GtkPixmap representing @filename +@GTK_ARG_READABLE: the argument is readable. (i.e. can be queried) +@GTK_ARG_WRITABLE: the argument is writable. (i.e. settable) +@GTK_ARG_CONSTRUCT: the argument needs construction. +@GTK_ARG_CONSTRUCT_ONLY: the argument needs construction (and will +be set once during object creation), but is otherwise cannot be +set. Hence this flag is not allowed with #GTK_ARG_WRITABLE, +and is redundant with #GTK_ARG_CONSTRUCT. +@GTK_ARG_CHILD_ARG: an argument type that applies to (and may be different for) +each child. Used by #GtkContainer. +@Deprecated: Use corresponding #GParamSpec features instead - + - +Define a function pointer. Deprecated. +@object: +@arg: +@arg_id: - + - +A structure containing information about the argument. +Returned by gtk_arg_get_info(). +@class_type: if the argument is an object, this is the object class type. +@name: the name of the argument. +@type: the type of the argument; it may be an object's type +or a fundamental type. +@arg_flags: flags applicable to the argument (i.e. readable, writable, +and whether it needs to be constructed). +@full_name: the object name and argument name separated by ::, +e.g. "GtkObject::user_data" or "GtkButton::label". +@arg_id: the unique argument identified. +@seq_id: ??? - + - +Define a function pointer. Deprecated. -@menubar: the object which received the signal. -@arg1: +@object: +@arg: +@arg_id: - + -@notebook: the object which received the signal. -@arg1: -@arg2: +@get_type_from_name: Looks up a type by name. The default + implementation applies heuristics to map type names to + _get_type function names, e.g. + GtkHBox to gtk_hbox_get_type(). This virtual function + is provided to allow language bindings to intercept the + type resolution process. - + - +Values for specifying what mouse button events a CList will +react to. -@notebook: the object which received the signal. -@arg1: -@arg2: +@GTK_BUTTON_IGNORED: +@GTK_BUTTON_SELECTS: +@GTK_BUTTON_DRAGS: +@GTK_BUTTON_EXPANDS: - + - +This is the embodiment of the #GtkCList widget. This structure contains +only private data, and should be accessed only via the CList API. -@notebook: the object which received the signal. -@arg1: -@arg2: - + -Setting this with a GtkType of GTK_TYPE_SIGNAL connects -the signal to the object, so that the user data and objects -and swapped when the signal handler is invoked. +This signal is emitted when a column resize is aborted. + +@clist: the object which received the signal. + + -This is useful for handlers that are primarily notifying -other objects and could just invoke an already existing function -if the parameters were swapped. -See g_signal_connect_swapped() for more details. +This signal is emitted when a column title is clicked. +@clist: The object which received the signal. +@column: The number of the column. - + -Setting this with a GtkType of GTK_TYPE_SIGNAL connects -the signal to the object, so that the user data and objects -and swapped when the signal handler is invoked, -and so that the handler is invoked after all others. +This signal is emitted when a selection ends in a +multiple selection CList. + +@clist: the object which received the signal. + + -See g_signal_connect_data() for more details. +This signal is emitted when the selection is extended. +@clist: the object which received the signal. +@scroll_type: A #GtkScrollType value of any scrolling operation the +occured during the selection. +@position: A value between 0.0 and 1.0. +@auto_start_selection: %TRUE or %FALSE. - + -Setting this with a GtkType of GTK_TYPE_SIGNAL connects -the signal to the object. +This signal is emitted when a column is resized. +@clist: The object which received the signal. +@column: The number of the column +@width: The new width of the column. - + -Setting this with a GtkType of GTK_TYPE_SIGNAL connects -the signal to the object, so that the signal is always run -after other user handlers and the default handler. +This signal is emitted when a row is moved. +@clist: The object which received the signal. +@arg1: The source position of the row. +@arg2: The destination position of the row. - + +This signal is emitted when the CList is scrolled horizontally. + +@clist: the object which received the signal. +@scroll_type: A #GtkScrollType value of how the scroll operation occured. +@position: a value between 0.0 and 1.0. + + + +This signal is emitted when the CList is scrolled vertically. -@oldeditable: the object which received the signal. +@clist: the object which received the signal. +@scroll_type: A #GtkScrollType value of how the scroll operation occured. +@position: A value between 0.0 and 1.0. - + +This signal is emitted when all the rows are selected in a CList. + + +@clist: the object which received the signal. + + +This signal is emitted when the user selects a row in the list. +It is emitted for every row that is selected in a multi-selection or +by calling gtk_clist_select_all(). -@oldeditable: the object which received the signal. -@arg1: -@arg2: +@clist: The object which received the signal. +@row: The row selected. +@column: The column where the selection occured. +@event: A #GdkEvent structure for the selection. - + -@oldeditable: the object which received the signal. +@clist: the object which received the signal. @arg1: @arg2: -@arg3: - + +This signal is emitted when a drag-selection is started in +a multiple-selection CList. + + +@clist: the object which received the signal. + + +This signal is emitted when "add mode" is toggled. -@parent: -@children: -@spacing: -@default_border_width: -@default_pad_x: -@default_pad_y: -@default_i_pad_x: -@default_i_pad_y: +@clist: the object which received the signal. - + +@clist: The object which received the signal. - + +This signal is emitted when an undo selection occurs in the CList, +probably via calling gtk_clist_undo_selection(). + +@clist: the object which received the signal. + + + +This signal is emitted when all rows are unselected in a CList. +@clist: the object which received the signal. - + +This signal is emitted when the user unselects a row in the list. +It is emitted for every row that is unselected in a multi-selection or +by calling gtk_clist_unselect_all(). It is also emitted for the +previously selected row in a "single" or "browse" mode CList. + +@clist: The object which received the signal. +@row: The selected row +@column: The column where the selection occured. +@event: + + + +An integer value for a column. - + +A boolean value for determining if the user can re-order the CList's +columns. + + + + +An integer value representing the height of a row in pixels. - + +Sets the type of selection mode for the CList. + + + + +Sets the shadowing for the CList. - + - + - +A boolean value for setting whether the column titles can be +clicked. -@widget: -@anchor: -@side: -@options: -@use_default: -@border_width: -@pad_x: -@pad_y: -@i_pad_x: -@i_pad_y: - + +A boolean value for setting whether to use icons during drag +operations. + + + + +A simple structure that the #GtkCList widget uses to keep track +of the location of a cell. -@GTK_PACK_EXPAND: -@GTK_FILL_X: -@GTK_FILL_Y: +@row: +@column: - + +A structure that the #GtkCList widget uses to keep track of information +about its columns. + + +@title: +@area: +@button: +@window: +@width: +@min_width: +@max_width: +@justification: +@visible: +@width_set: +@resizeable: +@auto_resize: +@button_passive: + + +Function prototype for the compare function callback. -@match_type: -@pattern_length: -@pattern: -@pattern_reversed: -@user_data: -@seq_id: +@clist: The #GtkCList that is affected. +@ptr1: A #gconstpointer to the first node to compare. +@ptr2: A #gconstpointer to the second node to compare. +@Returns: 0 if the nodes are equal, less than 0 if the first node should +come before the second, and greater than 1 if the second come before the +first. - + +A simple structure that the #GtkCList widget uses to track +a cell for a drag operation. + + +@cell: +@insert_pos: + + +An enumeration for drag operations. +@GTK_CLIST_DRAG_NONE: +@GTK_CLIST_DRAG_BEFORE: +@GTK_CLIST_DRAG_INTO: +@GTK_CLIST_DRAG_AFTER: - + +A structure that the #GtkCList widget uses to keep track of information +about its rows. + + +@cell: +@state: +@foreground: +@background: +@style: +@data: +@destroy: +@fg_set: +@bg_set: +@selectable: + + +A generic structure that the #GtkCList widget uses to keep track of the +contents of each of its cells. -@PRIVATE_GTK_USER_STYLE: -@PRIVATE_GTK_RESIZE_PENDING: -@PRIVATE_GTK_RESIZE_NEEDED: -@PRIVATE_GTK_LEAVE_PENDING: -@PRIVATE_GTK_HAS_SHAPE_MASK: -@PRIVATE_GTK_IN_REPARENT: -@PRIVATE_GTK_DIRECTION_SET: -@PRIVATE_GTK_DIRECTION_LTR: +@type: +@vertical: +@horizontal: +@style: +@widget: - + +A structure that the #GtkCList widget uses to keep track of #GtkCList cells +that contain a combination of text and a GdkPixmap. + + +@type: +@vertical: +@horizontal: +@style: +@text: +@spacing: +@pixmap: +@mask: + + +A structure that the #GtkCList widget uses to keep track of #GtkCList cells +that contain a GdkPixmap. +@type: +@vertical: +@horizontal: +@style: +@pixmap: +@mask: - + +@parent: - + +A structure that the #GtkCList widget uses to keep track of #GtkCList cells +that contain text. + + +@type: +@vertical: +@horizontal: +@style: +@text: + + +Identifies the type of element in the current cell of the CList. Cells can +contain text, pixmaps, or both. Unfortunately support for %GTK_CELL_WIDGET +was never completed. +@GTK_CELL_EMPTY: +@GTK_CELL_TEXT: +@GTK_CELL_PIXMAP: +@GTK_CELL_PIXTEXT: +@GTK_CELL_WIDGET: - + - + +A structure that the #GtkCList widget uses to keep track of #GtkCList cells +that contain another widget. + + +@type: +@vertical: +@horizontal: +@style: +@widget: + + +Defines a function pointer. - + - + - + -A function which you can use to clean up when the -signal handler is destroyed. +The #GtkCombo-struct struct contains the following fields. +(These fields should be considered read-only. They should never be set by +an application.) + +@entry: the text entry field. +@list: the list shown in the drop-down window. +@Deprecated: 2.4: Use #GtkComboBox instead. + + -For example, if your handler requires a few variables -that you made into a struct and allocated (using g_new() -or something), then you will probably want to free -it as soon as the hook is destroyed. This will -allow you to do that. (For this in particular -it is convenient to pass g_free() as a #GtkSignalDestroy -function). + -@data: The user data associated with the hook that is being -destroyed. - + -This is currently a hack left in for a scheme wrapper library. -It may be removed. + + + + -Don't use it. + -@object: The object which emits the signal. -@data: The user data associated with the hook. -@nparams: The number of parameters to the function. -@args: The actual values of the arguments. -@arg_types: The types of the arguments. -@return_type: The type of the return value from the function -or #GTK_TYPE_NONE for no return value. - + -This structure contains all the information about a particular -signal: its name, the type it affects, the signature of the handlers, -and its unique identifying integer. + -@object_type: -@signal_id: -@signal_name: -@is_user_signal: -@signal_flags: -@return_val: -@nparams: -@params: - + -Holds the data for a statusbar message. text holds the actual text string. context_id is the context that this message is associated with, and message_id is this particular message's identifier. However, these fields should not be modified directly. + -@text: -@context_id: -@message_id: - + -@parent_class: -@realize: -@unrealize: -@copy: -@clone: -@init_from_rc: -@set_background: -@render_icon: -@draw_hline: -@draw_vline: -@draw_shadow: -@draw_polygon: -@draw_arrow: -@draw_diamond: -@draw_string: -@draw_box: -@draw_flat_box: -@draw_check: -@draw_option: -@draw_tab: -@draw_shadow_gap: -@draw_box_gap: -@draw_extension: -@draw_focus: -@draw_slider: -@draw_handle: -@draw_expander: -@draw_layout: -@draw_resize_grip: -@_gtk_reserved1: -@_gtk_reserved2: -@_gtk_reserved3: -@_gtk_reserved4: -@_gtk_reserved5: -@_gtk_reserved6: -@_gtk_reserved7: -@_gtk_reserved8: -@_gtk_reserved9: -@_gtk_reserved10: -@_gtk_reserved11: -@_gtk_reserved12: +@combobox: the object which received the signal. - - -The widget field is a pointer to the widget that -this %GtkTableChild structure is keeping track of. -The left_attach, -right_attach, -top_attach, and -bottom_attach fields specify the row and column -numbers which make up the invisible rectangle that the child widget is packed into. - + -xpadding and ypadding -specify the space between this widget and the surrounding table cells. + -@widget: -@left_attach: -@right_attach: -@top_attach: -@bottom_attach: -@xpadding: -@ypadding: -@xexpand: -@yexpand: -@xshrink: -@yshrink: -@xfill: -@yfill: +@combobox: the object which received the signal. - + -These fields should be considered read-only and not be modified directly. + -@requisition: -@allocation: -@spacing: -@need_expand: -@need_shrink: -@expand: -@shrink: -@empty: - + - + +@container: the object which received the signal. +@direction: +@Returns: - + -A #GtkJustification for the text. This is only used when the tag is -applied to the first character in a paragraph. + - + -Pixel width of the left margin of the text for lines after the first -line in a wrapped paragraph. +The #GtkData-struct struct contains no public fields. - + - +Emitted to notify any views on the #GtkData object to disconnect from it, +possibly because the #GtkData object is about to be destroyed. +@data: the object which received the signal. - + -Pixels to offset the text horizontally or vertically, useful to -produce superscript and subscript. +Defines a function pointer. +@data: #gpointer - + - +This union not used in GTK+. -@textview: the object which received the signal. -@arg1: - + - +Indicates that the user has activated the widget +in some fashion. Generally, this will be done +with a keystroke. (The default binding for this +action is Return for #GtkEntry and +Control-Return for #GtkText.) +@editable: the object which received the signal. - + - +An action signal. Causes the characters in the current selection to +be copied to the clipboard. +@editable: the object which received the signal. - + - +An action signal. Causes the characters in the current +selection to be copied to the clipboard and then deleted from +the widget. +@editable: the object which received the signal. - + - +An action signal. Delete a single character. +@editable: the object which received the signal. +@direction: the direction in which to delete. Positive + indicates forward deletion, negative, backwards deletion. - + - +An action signal. Delete a single line. -@toolbar: the object which received the signal. -@arg1: -@Returns: +@editable: the object which received the signal. +@direction: the direction in which to delete. Positive + indicates forward deletion, negative, backwards deletion. - + - +An action signal. Delete a single word. +@editable: the object which received the signal. +@direction: the direction in which to delete. Positive + indicates forward deletion, negative, backwards deletion. - + - +An action signal. Move the cursor position. +@editable: the object which received the signal. +@x: horizontal distance to move the cursor. +@y: vertical distance to move the cursor. - + - +An action signal. Move the cursor by pages. +@editable: the object which received the signal. +@x: Number of pages to move the cursor horizontally. +@y: Number of pages to move the cursor vertically. - + - +An action signal. Move the cursor to the given column. -@GTK_TREE_SELECTION_SINGLE: -@GTK_TREE_SELECTION_MULTI: +@editable: the object which received the signal. +@column: the column to move to. (A negative value indicates + the last column) - + - +An action signal. Move the cursor to the given row. -@treeview: the object which received the signal. +@editable: the object which received the signal. +@row: the row to move to. (A negative value indicates + the last row) - + - +An action signal. Move the cursor by words. -@tree_view: -@context: -@path: -@user_data: -@Returns: +@editable: the object which received the signal. +@num_words: The number of words to move the +cursor. (Can be negative). - + - +An action signal. Causes the contents of the clipboard to +be pasted into the editable widget at the current cursor +position. -@tree_view: -@context: -@path: -@pos: -@user_data: -@Returns: +@editable: the object which received the signal. - + - +Determines if the user can edit the text in the editable +widget or not. This is meant to be overriden by +child classes and should not generally useful to +applications. -@uimanager: the object which received the signal. +@editable: the object which received the signal. +@is_editable: %TRUE if the user is allowed to edit the text + in the widget. - + -the #GtkAdjustment which sets the range of the scale. +A boolean indicating whether the widget is editable by +the user. - + - +The position of the cursor. - + - +A simple function pointer to get invoked when the +signal is emitted. This allows you tie a hook to the signal type, +so that it will trap all emissions of that signal, from any object. + + +You may not attach these to signals created with the +#GTK_RUN_NO_HOOKS flag. -@widget: the object which received the signal. -@arg1: +@object: +@signal_id: +@n_params: +@params: +@data: @Returns: - + -@widget: the object which received the signal. -@accel_signal_id: -@accel_group: -@accel_key: -@accel_mods: -@accel_flags: +@entry: the object which received the signal. - + -@widget: the object which received the signal. -@message: +@entry: the object which received the signal. +@arg1: +@arg2: - + -@widget: the object which received the signal. -@area: +@entry: the object which received the signal. +@arg1: +@event: - + -@widget: the object which received the signal. +@entry: the object which received the signal. +@arg1: +@event: - + -@widget: the object which received the signal. +@entry: the object which received the signal. +@arg1: +@arg2: +@arg3: - + -@widget: the object which received the signal. -@accel_group: -@accel_key: -@accel_mods: - + - + - + - + - + -@window: the object which received the signal. - + -@window: the object which received the signal. -@arg1: - + -If the window shrinks automatically when widgets within it shrink. + - + - + -@accel_group: -@path: -@accel_key: -@accel_mods: -@accel_flags: -@object: -@accel_signal: - + -@accel_group: -@object: - + -@class_type: -@signal_flags: -@handler_offset: -@Returns: - + -@class_type: -@signal_flags: -@handler_offset: -@Returns: - + -@accel_group: -@object: - + -@object: -@Returns: - + -@Returns: - + -@accel_group: -@accel_key: -@accel_mods: -@Returns: +@parent_class: +@inserted_text: +@deleted_text: +@get_text: +@get_length: +@insert_text: +@delete_text: +@_gtk_reserved0: +@_gtk_reserved1: +@_gtk_reserved2: +@_gtk_reserved3: +@_gtk_reserved4: +@_gtk_reserved5: - + - +A structure which contains a single enum value, and its name, and its +nickname. -@Returns: - + -@object: -@accel_signal_id: -@accel_group: -@accel_key: -@accel_mods: -@accel_flags: - + - +The #GtkFileSelection struct contains the following #GtkWidget fields: -@object: -@accel_group: -@accel_key: -@accel_mods: +@dir_list: +@file_list: +@selection_entry: +@selection_text: +@main_vbox: +@ok_button: +@cancel_button: the two main buttons that signals should be connected + to in order to perform an action when the user hits either OK or + Cancel. +@help_button: +@history_pulldown: the #GtkOptionMenu used to create the drop-down + directory history. +@history_menu: +@history_list: +@fileop_dialog: the dialog box used to display the #GtkFileSelection. + It can be customized by adding/removing widgets from it using the + standard #GtkDialog functions. +@fileop_entry: +@fileop_file: +@cmpl_state: +@fileop_c_dir: +@fileop_del_file: +@fileop_ren_file: the buttons that appear at the top of the file + selection dialog. These "operation buttons" can be hidden and + redisplayed with gtk_file_selection_hide_fileop_buttons() and + gtk_file_selection_show_fileop_buttons() respectively. +@button_area: +@action_area: - + -@accel_group: -@accel_key: -@accel_mods: - + -@accel_group: -@accel_key: -@accel_mods: -@object: - + -@accel_group: -@accel_key: -@accel_mods: - + +The #GtkFixedChild-struct struct contains the following fields. +(These fields should be considered read-only. They should never be set by +an application.) - + + + -@accel_label: -@Returns: + +#GtkWidget *widget; +the child #GtkWidget. + - - + +#gint x; +the horizontal position of the widget within the #GtkFixed +container. + + + +#gint y; +the vertical position of the widget within the #GtkFixed +container. + + -@accel_label: -@accel_object: +@widget: +@x: +@y: - + -@accel_path: -@notify_data: -@notify_func: -@accel_group: - + - +A set of bit flags used to specify the filter being set +when calling gtk_font_selection_dialog_set_filter() or +gtk_font_selection_set_filter(). -@accel_path: -@notify_data: -@notify_func: +@GTK_FONT_FILTER_BASE: the base filter, which can't be changed by the user. +@GTK_FONT_FILTER_USER: the user filter, which can be changed from within the +'Filter' page of the #GtkFontSelection widget. - - -It will either copy data into an existing argument or allocate a new argument -and copy the data. Strings are duplicated. All other pointers and -values are copied (shallowly-- that is the pointers themselves are -copied, not the data they point to.) - + -You should call gtk_arg_reset() on dest_arg before calling this -if the argument may contain string data that you want freed. +A set of bit flags used to specify the type of fonts shown +when calling gtk_font_selection_dialog_set_filter() or +gtk_font_selection_set_filter(). -@src_arg: the argument to duplicate. -@dest_arg: the argument to copy over (or NULL to create a new #GtkArg). -@Returns: the new #GtkArg (or dest_arg, if it was not NULL). +@GTK_FONT_BITMAP: bitmap fonts. +@GTK_FONT_SCALABLE: scalable fonts. +@GTK_FONT_SCALABLE_BITMAP: scaled bitmap fonts. +@GTK_FONT_ALL: a bitwise combination of all of the above. - + -Frees the argument, and optionally its contents. +#GtkFundamentalType is an enumerated type which lists all the possible +fundamental types (e.g. char, uchar, int, +long, float, etc). -@arg: the argument to free. -@free_contents: whether to free the string, if it is a string. - + -Private: get information about an argument. +the #GtkAdjustment which sets the range of the scale. -@object_type: the type of object. -@arg_info_hash_table: the hashtable of #GtkArgInfos. -@arg_name: the name of the argument to lookup. -@info_p: the argument info. -@Returns: an error message on failure, or NULL otherwise. - + -A #GCompareFunc for hashing #GtkArgInfos. + -@arg_info_1: a #GtkArgInfo. -@arg_info_2: a #GtkArgInfo. -@Returns: whether the arguments are the same. - + -A #GHashFunc for hashing #GtkArgInfos. + -@arg_info: a #GtkArgInfo. -@Returns: a hash value for that #GtkArgInfo. - + -Given a fully qualified argument name (e.g. "GtkButton::label") -it returns just the argument name (e.g. "label") unless -the argument name was invalid, in which case it returns NULL. +A GtkImageLoader is used to load a filename found in +a RC file. -@arg_name: the fully-qualified argument name. -@Returns: the base argument name. +@window: the window for creating image +@colormap: the colormap for this image +@mask: a pointer to the location to store the mask +@transparent_color: the transparent color for the image +@filename: filename to load +@Returns: a #GtkPixmap representing @filename - + -Creates a new argument of a certain type, set to 0 or NULL. + -@arg_type: the type of the argument. -@Returns: the newly created #GtkArg. - + -@arg: - + -@arg: -@value_pointer: - + -Create a new argument registered with a class. + -@base_class_type: the basic type having the arguments, almost alway -GTK_TYPE_OBJECT, except if your defining a different type argument -that gets a different namespace. #GtkContainer does this to define -per-child arguments of the container. -@arg_name: name of the argument to create. (must be a static constant string) -@class_n_args_offset: offset into the base class structure that tells -the number of arguments. -@arg_info_hash_table: hashtable of #GtkArgInfos. -@arg_type: type of the argument. -@arg_flags: flags of the argument. -@arg_id: ??? -@Returns: the new #GtkArgInfo. +@callback_data: +@callback_action: +@widget: - + + + + + +@widget: +@callback_data: +@callback_action: + + + + + + +@path: +@accelerator: +@callback: +@callback_action: +@item_type: +@extra_data: + + + + + + +@path: +@widgets: + + + + + + + + + + + + + + + +The child @widget has just been selected. + + +@list: the object which received the signal. +@widget: the newly selected child. + + + +The selection of the widget has just changed. + + +@list: the object which received the signal. + + + +The child @widget has just been unselected. + + +@list: the object which received the signal. +@widget: the newly unselected child. + + + + + + + + + +The #GtkListItem struct contains private data only, and should +only be accessed using the functions below. + + + + + + + + +@listitem: the object which received the signal. + + + + + + +@listitem: the object which received the signal. +@scroll_type: +@position: +@auto_start_selection: + + + + + + +@listitem: the object which received the signal. +@scroll_type: +@position: + + + + + + +@listitem: the object which received the signal. +@scroll_type: +@position: + + + + + + +@listitem: the object which received the signal. + + + + + + +@listitem: the object which received the signal. + + + + + + +@listitem: the object which received the signal. + + + + + + +@listitem: the object which received the signal. + + + + + + +@listitem: the object which received the signal. + + + + + + +@listitem: the object which received the signal. + + + + + + +@GTK_MATCH_ALL: +@GTK_MATCH_ALL_TAIL: +@GTK_MATCH_HEAD: +@GTK_MATCH_TAIL: +@GTK_MATCH_EXACT: +@GTK_MATCH_LAST: + + + + + + +@menubar: the object which received the signal. +@arg1: + + +@notebook: the object which received the signal. @arg1: @arg2: -@Returns: - + -Private: given a hashtable of argument information it takes a vararg -list and parses it into arguments (in the form of lists of #GtkArgs -and lists of #GtkArgInfos. + + +@notebook: the object which received the signal. +@arg1: +@arg2: + + -The list of arguments starts with first_arg_name then the first argument's -value. Followed by any number of additional name/argument pairs, -terminated with NULL. + -@object_type: the type of object we are collecting arguments for. -@arg_info_hash_table: a hashtable mapping from names of arguments -to their #GtkArgInfos. -@arg_list_p: a returned list of arguments obtained from parsing the -varargs. -@info_list_p: a returned list of the #GtkArgInfos. -@first_arg_name: the name of the first argument. -@var_args: a va_list containing the value of the first argument, -followed by name/value pairs, followed by NULL. -@Returns: an error message on failure, or NULL otherwise. +@notebook: the object which received the signal. +@arg1: +@arg2: - + -Private: erase lists of arguments returned from gtk_args_collect(). + -@arg_list: arg_list_p returned from gtk_args_collect(). -@info_list: info_list_p returned from gtk_args_collect(). - + -Private: from a class type and its arginfo hashtable, -get an array of #GtkArgs that this object accepts. + -@class_type: the class type. -@arg_info_hash_table: the hashtable of #GtkArgInfos. -@arg_flags: returned array of argument flags. -@n_args_p: the number of arguments this object accepts. -@Returns: the array of arguments (or NULL on error). - - -This is an internally used function and should never be called from an -application. + + + -@widget: -@nvis_children: -@width: -@height: - - -The internal padding of a button is the amount of space between the outside -of the button and the widget it contains. This function gets the default -amount of horizontal and vertical padding, placing the results in @ipad_x -and @ipad_y, respectively. + + + -@ipad_x: the default horizontal internal button padding. -@ipad_y: the default vertical internal button padding. - - -Retrieves the default minimum width and height for all button boxes, and -places the values in @min_width and @min_height, respectively. + + + -@min_width: the default minimum width of a child widget. -@min_height: the default minimum height of a child widget. - - -Sets the default number of pixels that pad each button in every button box. + + +Setting this with a GtkType of GTK_TYPE_SIGNAL connects +the signal to the object, so that the user data and objects +and swapped when the signal handler is invoked. + + +This is useful for handlers that are primarily notifying +other objects and could just invoke an already existing function +if the parameters were swapped. +See g_signal_connect_swapped() for more details. -@ipad_x: new default horizontal padding. -@ipad_y: new default vertical padding. - - -Sets the default size of child buttons. + + +Setting this with a GtkType of GTK_TYPE_SIGNAL connects +the signal to the object, so that the user data and objects +and swapped when the signal handler is invoked, +and so that the handler is invoked after all others. + + +See g_signal_connect_data() for more details. + + + + + +Setting this with a GtkType of GTK_TYPE_SIGNAL connects +the signal to the object. + + + + + +Setting this with a GtkType of GTK_TYPE_SIGNAL connects +the signal to the object, so that the signal is always run +after other user handlers and the default handler. + + + + + + + + + + + +Defines a function pointer. + + + + + + + + +@oldeditable: the object which received the signal. + + + + + + +@oldeditable: the object which received the signal. +@arg1: +@arg2: + + + + + + +@oldeditable: the object which received the signal. +@arg1: +@arg2: +@arg3: + + + + + + +@parent: +@children: +@spacing: +@default_border_width: +@default_pad_x: +@default_pad_y: +@default_i_pad_x: +@default_i_pad_y: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@widget: +@anchor: +@side: +@options: +@use_default: +@border_width: +@pad_x: +@pad_y: +@i_pad_x: +@i_pad_y: + + + + + + +@GTK_PACK_EXPAND: +@GTK_FILL_X: +@GTK_FILL_Y: + + + + + + +@match_type: +@pattern_length: +@pattern: +@pattern_reversed: +@user_data: +@seq_id: + + + +The #GtkPreview-struct struct contains private data only, and +should be accessed using the functions below. + + + + + + + + + + + +Contains information about global properties +of preview widgets. + +The #GtkPreviewInfo struct contains the following fields. +(These fields should be considered read-only. They should never be set by +an application.) + + + + + + +#GdkVisual *visual; +the visual used by all previews. + + + +#GdkColormap *cmap; +the colormap used by all previews. + + + +gdouble gamma; +the gamma correction value used by all previews (See gtk_preview_set_gamma()). + + + + + + + + +@lookup: +@gamma: + + + +An enumeration which describes whether a preview +contains grayscale or red-green-blue data. + + +@GTK_PREVIEW_COLOR: the preview contains red-green-blue data. +@GTK_PREVIEW_GRAYSCALE: The preview contains grayscale data. + + + + + + +@func_data: +@str: + + + + + + + + + + + + +@PRIVATE_GTK_USER_STYLE: +@PRIVATE_GTK_RESIZE_PENDING: +@PRIVATE_GTK_RESIZE_NEEDED: +@PRIVATE_GTK_LEAVE_PENDING: +@PRIVATE_GTK_HAS_SHAPE_MASK: +@PRIVATE_GTK_IN_REPARENT: +@PRIVATE_GTK_DIRECTION_SET: +@PRIVATE_GTK_DIRECTION_LTR: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@GTK_SIDE_TOP: +@GTK_SIDE_BOTTOM: +@GTK_SIDE_LEFT: +@GTK_SIDE_RIGHT: + + + +A function which you can use to clean up when the +signal handler is destroyed. + + +For example, if your handler requires a few variables +that you made into a struct and allocated (using g_new() +or something), then you will probably want to free +it as soon as the hook is destroyed. This will +allow you to do that. (For this in particular +it is convenient to pass g_free() as a #GtkSignalDestroy +function). + + +@data: The user data associated with the hook that is being +destroyed. + + + +Defines a function pointer. + + + + + +This is currently a hack left in for a scheme wrapper library. +It may be removed. + + +Don't use it. + + +@object: The object which emits the signal. +@data: The user data associated with the hook. +@nparams: The number of parameters to the function. +@args: The actual values of the arguments. +@arg_types: The types of the arguments. +@return_type: The type of the return value from the function +or #GTK_TYPE_NONE for no return value. + + + +Defines a function pointer. + + + + + +This structure contains all the information about a particular +signal: its name, the type it affects, the signature of the handlers, +and its unique identifying integer. + + +@object_type: +@signal_id: +@signal_name: +@is_user_signal: +@signal_flags: +@return_val: +@nparams: +@params: + + + +Holds the data for a statusbar message. text holds the actual text string. context_id is the context that this message is associated with, and message_id is this particular message's identifier. However, these fields should not be modified directly. + + +@text: +@context_id: +@message_id: + + + + + + +@parent_class: +@realize: +@unrealize: +@copy: +@clone: +@init_from_rc: +@set_background: +@render_icon: +@draw_hline: +@draw_vline: +@draw_shadow: +@draw_polygon: +@draw_arrow: +@draw_diamond: +@draw_string: +@draw_box: +@draw_flat_box: +@draw_check: +@draw_option: +@draw_tab: +@draw_shadow_gap: +@draw_box_gap: +@draw_extension: +@draw_focus: +@draw_slider: +@draw_handle: +@draw_expander: +@draw_layout: +@draw_resize_grip: +@_gtk_reserved1: +@_gtk_reserved2: +@_gtk_reserved3: +@_gtk_reserved4: +@_gtk_reserved5: +@_gtk_reserved6: +@_gtk_reserved7: +@_gtk_reserved8: +@_gtk_reserved9: +@_gtk_reserved10: +@_gtk_reserved11: +@_gtk_reserved12: + + + +The widget field is a pointer to the widget that +this %GtkTableChild structure is keeping track of. +The left_attach, +right_attach, +top_attach, and +bottom_attach fields specify the row and column +numbers which make up the invisible rectangle that the child widget is packed into. + + +xpadding and ypadding +specify the space between this widget and the surrounding table cells. + + +@widget: +@left_attach: +@right_attach: +@top_attach: +@bottom_attach: +@xpadding: +@ypadding: +@xexpand: +@yexpand: +@xshrink: +@yshrink: +@xfill: +@yfill: + + + +These fields should be considered read-only and not be modified directly. + + +@requisition: +@allocation: +@spacing: +@need_expand: +@need_shrink: +@expand: +@shrink: +@empty: + + + + + + + + + + + + + + + +A #GtkJustification for the text. This is only used when the tag is +applied to the first character in a paragraph. + + + + + +Pixel width of the left margin of the text for lines after the first +line in a wrapped paragraph. + + + + + + + + + + + +Pixels to offset the text horizontally or vertically, useful to +produce superscript and subscript. + + + + + + + + +@textview: the object which received the signal. +@arg1: + + + + + + + + + + + + + + + + + + + + + +The #GtkTipsQuery-struct struct contains private data only, and +should be accessed using the functions below. + + + + + +Emitted when the query is started. + + +@tipsquery: the object which received the signal. + + + +Emitted when the query is stopped. + + +@tipsquery: the object which received the signal. + + + +Emitted when a widget is entered by the pointer while the query is in effect. + + +@tipsquery: the object which received the signal. +@widget: the widget that was entered by the pointer. +@tip_text: the widget's tooltip. +@tip_private: the widget's private tooltip (see gtk_tooltips_set_tip()). + + + +Emitted when a widget is selected during a query. + + +@tipsquery: the object which received the signal. +@widget: the widget that was selected. +@tip_text: the widget's tooltip. +@tip_private: the widget's private tooltip (see gtk_tooltips_set_tip()). +@event: the button press or button release event. +@Returns: %TRUE if the query should be stopped. + + + +The widget that starts the tips query, usually a button. +If it is selected while the query is in effect the query is automatically +stopped. + + + + + +%TRUE if the widget-entered and widget-selected signals are emitted even when +the widget has no tooltip set. + + + + + +The text to display in the #GtkTipsQuery widget when the query is not in +effect. + + + + + +The text to display in the #GtkTipsQuery widget when the query is running +and the widget that the pointer is over has no tooltip. + + + + + + + + + + + + + + +@toolitem: the object which received the signal. +@arg1: +@arg2: +@arg3: +@Returns: + + + + + + +@toolbar: the object which received the signal. +@arg1: +@Returns: + + + + + + + + + + + + + + + + + + + + + +The function used to translate messages in e.g. #GtkIconFactory +and #GtkActionGroup. + + +@path: The id of the message. In #GtkItemFactory this will be a path + from a #GtkItemFactoryEntry, in #GtkActionGroup, it will be a label + or tooltip from a #GtkActionEntry. +@func_data: user data passed in when registering the function +@Returns: the translated message + + + + + + + + + + + + +@GTK_TREE_SELECTION_SINGLE: +@GTK_TREE_SELECTION_MULTI: + + + + + + +@treeview: the object which received the signal. + + + + + + +@tree_view: +@context: +@path: +@user_data: +@Returns: + + + + + + +@tree_view: +@context: +@path: +@pos: +@user_data: +@Returns: + + + +#GtkType is unique integer identifying the type. The guts of the +information about the type is held in a private struct named +#GtkTypeNode. + + + + + +The base structure for a GTK+ type. Every type inherits this as a base structure. + + + + + +Holds information about the type. gtk_type_name() returns the name. +@object_size is somehow set to the number of bytes that an instance of +the object will occupy. @class_init_func holds the type's +initialization function. @object_init_func holds the initialization +function for an instance of the object. @reserved_1 is used for +#GtkEnumValue to hold the enumerated values. + + +@type_name: +@object_size: +@class_size: +@class_init_func: +@object_init_func: +@reserved_1: +@reserved_2: +@base_class_init_func: + + + +A #GtkTypeObject defines the minimum structure requirements +for type instances. Type instances returned from gtk_type_new () +and initialized through a #GtkObjectInitFunc need to directly inherit +from this structure or at least copy its fields one by one. + + + + + + + + +@uimanager: the object which received the signal. + + + +the #GtkAdjustment which sets the range of the scale. + + + + + + + + + + + + + + +@widget: the object which received the signal. +@arg1: +@Returns: + + + + + + +@widget: the object which received the signal. +@accel_signal_id: +@accel_group: +@accel_key: +@accel_mods: +@accel_flags: + + + + + + +@widget: the object which received the signal. +@message: + + + + + + +@widget: the object which received the signal. +@area: + + + + + + +@widget: the object which received the signal. + + + + + + +@widget: the object which received the signal. + + + + + + +@widget: the object which received the signal. +@accel_group: +@accel_key: +@accel_mods: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@window: the object which received the signal. + + + + + + +@window: the object which received the signal. +@arg1: + + + +If the window shrinks automatically when widgets within it shrink. + + + + + + + + + + + + + + +@accel_group: +@path: +@accel_key: +@accel_mods: +@accel_flags: +@object: +@accel_signal: + + + + + + +@accel_group: +@object: + + + + + + +@class_type: +@signal_flags: +@handler_offset: +@Returns: + + + + + + +@class_type: +@signal_flags: +@handler_offset: +@Returns: + + + + + + +@accel_group: +@object: + + + + + + +@object: +@Returns: + + + + + + +@Returns: + + + + + + +@accel_group: +@accel_key: +@accel_mods: +@Returns: + + + + + + +@Returns: + + + + + + +@object: +@accel_signal_id: +@accel_group: +@accel_key: +@accel_mods: +@accel_flags: + + + + + + +@object: +@accel_group: +@accel_key: +@accel_mods: + + + + + + +@accel_group: +@accel_key: +@accel_mods: + + + + + + +@accel_group: +@accel_key: +@accel_mods: +@object: + + + + + + +@accel_group: +@accel_key: +@accel_mods: + + + + + + +@accel_label: +@Returns: + + + + + + +@accel_label: +@accel_object: + + + + + + +@accel_path: +@notify_data: +@notify_func: +@accel_group: + + + + + + +@accel_path: +@notify_data: +@notify_func: + + + +It will either copy data into an existing argument or allocate a new argument +and copy the data. Strings are duplicated. All other pointers and +values are copied (shallowly-- that is the pointers themselves are +copied, not the data they point to.) + + +You should call gtk_arg_reset() on dest_arg before calling this +if the argument may contain string data that you want freed. + + +@src_arg: the argument to duplicate. +@dest_arg: the argument to copy over (or NULL to create a new #GtkArg). +@Returns: the new #GtkArg (or dest_arg, if it was not NULL). + + + +Frees the argument, and optionally its contents. + + +@arg: the argument to free. +@free_contents: whether to free the string, if it is a string. + + + +Private: get information about an argument. + + +@object_type: the type of object. +@arg_info_hash_table: the hashtable of #GtkArgInfos. +@arg_name: the name of the argument to lookup. +@info_p: the argument info. +@Returns: an error message on failure, or NULL otherwise. + + + +A #GCompareFunc for hashing #GtkArgInfos. + + +@arg_info_1: a #GtkArgInfo. +@arg_info_2: a #GtkArgInfo. +@Returns: whether the arguments are the same. + + + +A #GHashFunc for hashing #GtkArgInfos. + + +@arg_info: a #GtkArgInfo. +@Returns: a hash value for that #GtkArgInfo. + + + +Given a fully qualified argument name (e.g. "GtkButton::label") +it returns just the argument name (e.g. "label") unless +the argument name was invalid, in which case it returns NULL. + + +@arg_name: the fully-qualified argument name. +@Returns: the base argument name. + + + +Creates a new argument of a certain type, set to 0 or NULL. + + +@arg_type: the type of the argument. +@Returns: the newly created #GtkArg. + + + + + + +@arg: + + + + + + +@arg: +@value_pointer: + + + +Create a new argument registered with a class. + + +@base_class_type: the basic type having the arguments, almost alway +GTK_TYPE_OBJECT, except if your defining a different type argument +that gets a different namespace. #GtkContainer does this to define +per-child arguments of the container. +@arg_name: name of the argument to create. (must be a static constant string) +@class_n_args_offset: offset into the base class structure that tells +the number of arguments. +@arg_info_hash_table: hashtable of #GtkArgInfos. +@arg_type: type of the argument. +@arg_flags: flags of the argument. +@arg_id: ??? +@Returns: the new #GtkArgInfo. + + + + + + +@arg1: +@arg2: +@Returns: + + + +Private: given a hashtable of argument information it takes a vararg +list and parses it into arguments (in the form of lists of #GtkArgs +and lists of #GtkArgInfos. + + +The list of arguments starts with first_arg_name then the first argument's +value. Followed by any number of additional name/argument pairs, +terminated with NULL. + + +@object_type: the type of object we are collecting arguments for. +@arg_info_hash_table: a hashtable mapping from names of arguments +to their #GtkArgInfos. +@arg_list_p: a returned list of arguments obtained from parsing the +varargs. +@info_list_p: a returned list of the #GtkArgInfos. +@first_arg_name: the name of the first argument. +@var_args: a va_list containing the value of the first argument, +followed by name/value pairs, followed by NULL. +@Returns: an error message on failure, or NULL otherwise. + + + +Private: erase lists of arguments returned from gtk_args_collect(). + + +@arg_list: arg_list_p returned from gtk_args_collect(). +@info_list: info_list_p returned from gtk_args_collect(). + + + +Private: from a class type and its arginfo hashtable, +get an array of #GtkArgs that this object accepts. + + +@class_type: the class type. +@arg_info_hash_table: the hashtable of #GtkArgInfos. +@arg_flags: returned array of argument flags. +@n_args_p: the number of arguments this object accepts. +@Returns: the array of arguments (or NULL on error). + + + + + + + + + + + + +@binding_set: +@keyval: +@modifiers: + + + + + + +@scanner: +@Returns: + + + +This is an internally used function and should never be called from an +application. + + +@widget: +@nvis_children: +@width: +@height: + + + +The internal padding of a button is the amount of space between the outside +of the button and the widget it contains. This function gets the default +amount of horizontal and vertical padding, placing the results in @ipad_x +and @ipad_y, respectively. + + +@ipad_x: the default horizontal internal button padding. +@ipad_y: the default vertical internal button padding. + + + +Retrieves the default minimum width and height for all button boxes, and +places the values in @min_width and @min_height, respectively. + + +@min_width: the default minimum width of a child widget. +@min_height: the default minimum height of a child widget. + + + +Sets the default number of pixels that pad each button in every button box. + + +@ipad_x: new default horizontal padding. +@ipad_y: new default vertical padding. + + + +Sets the default size of child buttons. + + +@min_width: minimum default width for child buttons. +@min_height: minimum default height for child buttons. + + + + + + +@uline_label: +@accel_group: +@Returns: + + + + + + +@stock_id: +@accel_group: +@Returns: + + + + + +@calendar: +@flags: + + + + + +@calendar: + + + + + +@calendar: + + + + + + +@cell: +@event: +@widget: +@path: +@background_area: +@cell_area: +@flags: +@Returns: + + + + + + +@Returns: + + + + + + +@cell_view: +@Returns: + + + + + + +@cell_view: +@Returns: + + + + + + +@cell_view: +@cellview: + + + + + + +@cell_view: +@use_fg: + + + +Adds a row to the CList at the bottom. + + +@clist: The #GtkCList to affect. +@text: An array of strings to add. +@Returns: The number of the row added. + + + +Removes all the CList's rows. + + +@clist: The #GtkCList to affect. + + + +Sets the specified column in the #GtkCList to become selectable. You can +then respond to events from the user clicking on a title button, and take +appropriate action. + + +@clist: The #GtkCList to affect. +@column: The column to make active, counting from 0. + + + +Causes the specified column title button to become passive, i.e., does +not respond to events, such as the user clicking on it. + + +@clist: The #GtkCList to affect. +@column: The column to make passive, counting from 0. + + + +Causes all column title buttons to become active. This is the same +as calling gtk_clist_column_title_active() for each column. + + +@clist: The #GtkCList to affect. + + + +Causes the #GtkCList to hide its column titles, if they are currently +showing. + + +@clist: The #GtkCList to affect. + + + +Causes all column title buttons to become passive. This is the same +as calling gtk_clist_column_title_passive() for each column. + + +@clist: The #GtkCList to affect. + + + +This function causes the #GtkCList to show its column titles, if +they are not already showing. + + +@clist: The #GtkCList to affect. + + + +Auto-sizes all columns in the CList and returns the total width of the CList. + + +@clist: The #GtkCList to affect. +@Returns: The total width of the CList. + + + +Initializes a previously allocated #GtkCList widget for use. This should not +normally be used to create a #GtkCList widget. Use gtk_clist_new() instead. + + +@clist: A pointer to an uninitialized #GtkCList widget. +@columns: The number of columns the #GtkCList should have. +@titles: An array of strings that should be used as the titles i +of the columns. There should be enough strings in the array for +the number of columns specified. + + + +Searches the CList for the row with the specified data. + + +@clist: The #GtkCList to search. +@data: The data to search for a match. +@Returns: The number of the matching row, or -1 if no match could be found. + + + +Causes the #GtkCList to stop updating its visuals until a matching call to +gtk_clist_thaw() is made. This function is useful if a lot of changes +will be made to the widget that may cause a lot of visual updating to +occur. Note that calls to gtk_clist_freeze() can be nested. + + +@clist: The #GtkCList to freeze. + + + +Gets the current style of the specified cell. + + +@clist: The #GtkCList to affect. +@row: The row of the cell. +@column: The column of the cell. +@Returns: A #GtkStyle object. + + + +Checks the type of cell at the location specified. + + +@clist: The #GtkCList to affect. +@row: The row of the cell. +@column: The column of the cell. +@Returns: A #GtkCellType value describing the cell. + + + +Gets the current title of the specified column + + +@clist: The #GtkCList to affect. +@column: The column to query. +@Returns: The title of the column. + + + +Gets the widget in the column header for the specified column. + + +@clist: The #GtkCList to affect. +@column: The column to query. +@Returns: Pointer to a #GtkWidget for the column header. + + + +Gets the #GtkAdjustment currently being used for the horizontal +aspect. + + +@clist: The #GtkCList to check. +@Returns: A #GtkAdjustment object, or NULL if none is currently +being used. + + + +Gets the pixmap and bitmap mask of the specified cell. The returned mask value can be NULL. + + +@clist: The #GtkCList to affect. +@row: The row of the cell. +@column: The column of the cell. +@pixmap: A pointer to a pointer to store the cell's #GdkPixmap. +@mask: A pointer to a pointer to store the cell's #GdkBitmap mask. +@Returns: 1 if the cell's pixmap could be retrieved, 0 otherwise. + + + +Gets the text, pixmap and bitmap mask for the specified cell. + + +@clist: The #GtkCList to affect. +@row: The row to query. +@column: The column to query. +@text: A pointer to a pointer to store the text. +@spacing: A pointer to a #guint8 to store the spacing. +@pixmap: A pointer to a #GdkPixmap pointer to store the cell's pixmap. +@mask: A pointer to a #GdkBitmap pointer to store the cell's bitmap mask. +@Returns: 1 if the retrieval was successful, 0 otherwise. + + + +Gets the currently set data for the specified row. + + +@clist: The #GtkCList to affect. +@row: The row to query. +@Returns: The data set for the row. + + + +Gets the style set for the specified row. + + +@clist: The #GtkCList to affect. +@row: The row to query. +@Returns: The #GtkStyle of the row. + + + +Gets whether the specified row is selectable or not. + + +@clist: The #GtkCList to affect. +@row: The row to query. +@Returns: A #gboolean value. + + + +Gets the row and column at the specified pixel position in the CList. + + +@clist: The #GtkCList to affect. +@x: The horizontal pixel position to check. +@y: The vertical pixel position to check.. +@row: Pointer to a #gint to store the row value. +@column: Pointer to a #gint to store the column value. +@Returns: 1 if row/column is returned and in range, 0 otherwise. + + + +Gets the text for the specified cell. + + +@clist: The #GtkCList to affect. +@row: The row to query. +@column: The column to query. +@text: A pointer to a pointer to store the text. +@Returns: 1 if the cell's text could be retrieved, 0 otherwise. + + + +Gets the #GtkAdjustment currently being used for the vertical +aspect. + + +@clist: The #GtkCList to check. +@Returns: A #GtkAdjustment object, or NULL if none is currently +being used. + + + +Adds a row of text to the CList at the specified position. + + +@clist: The #GtkCList to affect. +@row: The row where the text should be inserted. +@text: An array of string to add. +@Returns: The number of the row added. + + + +Tells the CList widget to visually move to the specified +row and column. + + +@clist: The #GtkCList to affect. +@row: The row to which to move. +@column: The column to which to move. +@row_align: A value between 0 and 1 that describes the positioning of +the row in relation to the viewable area of the CList's contents. +@col_align: A value between 0 and 1 that describes the positioning of +the column in relation to the viewable area of the CList's contents. + + + +Creates a new #GtkCList widget for use. + + +@columns: The number of columns the #GtkCList should have. +@Returns: A pointer to a new GtkCList object. + + + +Creates a new #GtkCList widget with column titles for use. + + +@columns: The number of columns the #GtkCList should have. +@titles: A string array of titles for the widget. There should be +enough strings in the array for the specified number of columns. +@Returns: A pointer to a new GtkCList object. + + + +Gets the required width in pixels that is needed to show +everything in the specified column. + + +@clist: The #GtkCList to check. +@column: The column to check. +@Returns: The required width in pixels for the column. + + + +Adds a row to the CList at the top. + + +@clist: The #GtkCList to affect. +@text: An array of strings to add. +@Returns: The number of the row added. + + + +Removes the specified row from the CList. + + +@clist: The #GtkCList to affect. +@row: The row to remove. + + + +Checks how the specified row is visible. + + +@clist: The #GtkCList to affect. +@row: The row to query. +@Returns: A #GtkVisibility value that tells you how the row is visible. + + + +Allows you to move a row from one position to another in the +list. + + +@clist: The #GtkCList to affect. +@source_row: The original position of the row to move. +@dest_row: The position to which the row should be moved. + + + +Selects all rows in the CList. This function has no affect for a +CList in "single" or "browse" selection mode. + + +@clist: The #GtkCList to affect. + + + +Selects the specified row. Causes the "select-row" signal to be emitted for the specified row and column. + + +@clist: The #GtkCList to affect. +@row: The row to select. +@column: The column to select. + + + +Turns on or off auto sort of the #GtkCList. If auto sort is on, then the CList will be resorted when a row is inserted into the CList. + + +@clist: The #GtkCList to affect. +@auto_sort: whether auto sort should be on or off + + + +Sets the background color for the specified row. + + +@clist: The #GtkCList to affect. +@row: The row to affect. +@color: A pointer to a #GdkColor structure. + + + +Sets the action(s) that the specified mouse button will have +on the CList. + + +@clist: The #GtkCList to affect. +@button: The mouse button to set. The values here, unlike in the + rest of GTK+ start from 0. For instance, the right mouse + button, which is 3 elsewhere, should be given as 2 here. +@button_actions: A logically OR'd value of #GtkButtonAction values +for the button. + + + +Sets the style for the specified cell. + + +@clist: The #GtkCList to affect. +@row: The row of the cell. +@column: The column of the cell. +@style: A pointer to a #GtkStyle structure. + + + +Lets you specify whether a column should be automatically resized +by the widget when data is added or removed. Enabling auto-resize +on a column explicity disallows user-resizing of the column. + + +@clist: The #GtkCList to affect. +@column: The column on which to set auto-resizing. +@auto_resize: %TRUE or %FALSE. + + + +Sets the justification to be used for all text in the specified +column. + + +@clist: The #GtkCList to affect. +@column: The column which should be affected. +@justification: A GtkJustification value for the column. + + + +Causes the column specified to have a maximum width, preventing +the user from resizing it larger than that specified. + + +@clist: The #GtkCList to affect. +@column: The column to set the maximum width. +@max_width: The width, in pixels. + + + +Causes the column specified to have a minimum width, preventing +the user from resizing it smaller than that specified. + + +@clist: The #GtkCList to affect. +@column: The column to set the minimum width. +@min_width: The width, in pixels. + + + +Lets you specify whether a specified column should be resizeable +by the user. Note that turning on resizeability for the column will +automatically shut off auto-resizing, but turning off resizeability +will NOT turn on auto-resizing. This must be done manually via a +call to gtk_clist_set_column_auto_resize(). + + +@clist: The #GtkCList to affect. +@column: The column on which to set resizeability. +@resizeable: %TRUE or %FALSE. + + + +Sets the title for the specified column. + + +@clist: The #GtkCList to affect. +@column: The column whose title should be changed. +@title: A string to be the column's title. + + + +Allows you to set whether a specified column in the #GtkCList should +be hidden or shown. Note that at least one column must always be +showing, so attempting to hide the last visible column will be +ignored. + + +@clist: The #GtkCList to affect. +@column: The column to set visibility. +@visible: %TRUE or %FALSE. + + + +Sets a widget to be used as the specified column's title. This +can be used to place a pixmap or something else as the column +title, instead of the standard text. + + +@clist: The #GtkCList to affect. +@column: The column whose title should be a widget. +@widget: A pointer to a previously create widget. + + + +Causes the column specified for the #GtkCList to be set to +a specified width. + + +@clist: The #GtkCList to affect. +@column: The column to set the width. +@width: The width, in pixels. + + + +Sets the compare function of the #GtkClist to @cmp_func. If @cmp_func is NULL, +then the default compare function is used. The default compare function sorts +ascending or with the type set by gtk_clist_set_sort_type() by the column set +by gtk_clist_set_sort_column(). + + +@clist: The #GtkCList to affect. +@cmp_func: The #GtkCompareFunction to use. + + + +Sets the foreground color for the specified row. + + +@clist: The #GtkCList to affect. +@row: The row to affect. +@color: A pointer to a #GdkColor structure. + + + +Allows you to set the #GtkAdjustment to be used for the horizontal +aspect of the #GtkCList widget. + + +@clist: The #GtkCList to affect. +@adjustment: A pointer to a #GtkAdjustment widget, or NULL. + + + +Sets a pixmap for the specified cell. + + +@clist: The #GtkCList to affect. +@row: The row of the cell. +@column: The column of the cell. +@pixmap: A pointer to a #GdkPixmap to place in the cell. +@mask: A pointer to a #GdkBitmap mask for the cell. + + + +Sets text and a pixmap/bitmap on the specified cell. + + +@clist: The #GtkCList to affect. +@row: The row of the cell. +@column: The column of the cell. +@text: The text to set in the cell. +@spacing: The spacing between the cell's text and pixmap. +@pixmap: A pointer to a #GdkPixmap for the cell. +@mask: A pointer to a #GdkBitmap mask for the cell. + + + +Sets whether the CList's rows are re-orderable using drag-and-drop. + + +@clist: The #GtkCList to affect. +@reorderable: %TRUE or %FALSE. + + + +Sets data for the specified row. This is the same as calling gtk_clist_set_row_data_full(clist, row, data, NULL). + + +@clist: The #GtkCList to affect. +@row: The row to affect. +@data: The data to set for the row. + + + +Sets the data for specified row, with a callback when the row is destroyed. + + +@clist: The #GtkCList to affect. +@row: The row to affect. +@data: The data to set for the row. +@destroy: A #GtkDestroyNotify function to be called when the row is destroyed. + + + +Causes the #GtkCList to have a specified height for its +rows. Setting the row height to 0 allows the #GtkCList to adjust +automatically to data in the row. + + +@clist: The #GtkCList to affect. +@height: The height, in pixels. + + + +Sets the style for all cells in the specified row. + + +@clist: The #GtkCList to affect. +@row: The row to affect. +@style: A pointer to a #GtkStyle to set. + + + +Sets whether the specified row is selectable or not. + + +@clist: The #GtkCList to affect. +@row: The row to affect. +@selectable: %TRUE or %FALSE. + + + +Sets the selection mode for the specified CList. This allows you to +set whether only one or more than one item can be selected at a time +in the widget. Note that setting the widget's selection mode to one +of GTK_SELECTION_BROWSE or GTK_SELECTION_SINGLE will cause all the +items in the #GtkCList to become deselected. + + +@clist: The #GtkCList to affect. +@mode: The GtkSelectionMode type to set for this CList. + + + +Sets the shadow type for the specified CList. Changing this value +will cause the #GtkCList to update its visuals. + + +@clist: The #GtkCList to affect. +@type: The GtkShadowType desired. + + + +Sets the vertical and horizontal shift of the specified cell. + + +@clist: The #GtkCList to affect. +@row: The row of the cell. +@column: The column of the cell. +@vertical: The value to set for the vertical shift. +@horizontal: The value to set for the vertical shift. + + + +Sets the sort column of the clist. The sort column is used by the +default compare function to determine which column to sort by. + + +@clist: The #GtkCList to affect. +@column: The column to sort by + + + +Sets the sort type of the #GtkClist. This is either GTK_SORT_ASCENDING for +ascening sort or GTK_SORT_DESCENDING for descending sort. + + +@clist: The #GtkCList to affect. +@sort_type: the #GtkSortType to use + + + +Sets the displayed text in the specified cell. + + +@clist: The #GtkCList to affect. +@row: The row of the cell. +@column: The column of the cell. +@text: The text to set in the cell. + + + +Determines whether the #GtkClist should use icons when +doing drag-and-drop operations. + + +@clist: The #GtkCList to affect. +@use_icons: %TRUE or %FALSE. + + + +Allows you to set the #GtkAdjustment to be used for the vertical +aspect of the #GtkCList widget. + + +@clist: The #GtkCList to affect. +@adjustment: A pointer to a #GtkAdjustment widget, or NULL. + + + +Sorts the #GtkClist according to the current compare function, which +can be set with the gtk_clist_set_compare_func() function. + + +@clist: The #GtkCList to sort. + + + +Swaps the two specified rows with each other. + + +@clist: The #GtkCList to affect. +@row1: Number of the first row. +@row2: Number of the second row. + + + +Causes the specified #GtkCList to allow visual updates. + + +@clist: The #GtkCList to thaw. + + + +Undoes the last selection for an "extended selection mode" CList. + + +@clist: The #GtkCList to affect. + + + +Unselects all rows in the CList. + + +@clist: The #GtkCList to affect. + + + +Unselects the specified row. Causes the "unselect-row" signal to be emitted for the specified row and column. + + +@clist: The #GtkCList to affect. +@row: The row to select. +@column: The column to select. + + + + + + +@colorsel: +@color: + + + + + + +@colorsel: +@color: + + + + + + +@colorsel: +@Returns: + + + + + + +@colorsel: +@Returns: + + + + + + +@func: +@Returns: + + + + + + +@colorsel: +@color: + + + + + + +@colorsel: +@color: + + + +Controls whether opacity can be set with the #GtkColorSelection. +If this functionality is enabled, the necessary additional widgets +are added to the #GtkColorSelection and the opacity value can be +retrieved via the fourth value in the color array returned by +the gtk_color_selection_get_color() function. + + +@colorsel: a #GtkColorSelection. +@use_opacity: a boolean indicating whether the opacity selection +is enabled. + + + + + + +@colorsel: +@use_opacity: + + + + + + +@colorsel: +@use_palette: + + + + + + +@combo_box: +@Returns: + + + + + + +@combo_box: +@column: + + + +Stops the #GtkCombo widget from showing the popup list when the #GtkEntry +emits the "activate" signal, i.e. when the Return key is pressed. +This may be useful if, for example, you want the Return key to close a dialog +instead. + + +@combo: a #GtkCombo. +@Deprecated: 2.4: Use #GtkComboBox instead. + + + +Creates a new #GtkCombo. + + +@Returns: a new #GtkCombo. +@Deprecated: 2.4: Use #GtkComboBox instead. + + + +Specifies whether the text entered into the #GtkEntry field and the text in +the list items is case sensitive. + + +This may be useful, for example, when you have called +gtk_combo_set_value_in_list() to limit the values entered, but you are not +worried about differences in case. + + +@combo: a #GtkCombo. +@val: %TRUE if the text in the list items is case sensitive. +@Deprecated: 2.4: Use #GtkComboBox instead. + + + +Sets the string to place in the #GtkEntry field when a particular list item is +selected. This is needed if the list item is not a simple label. + + +@combo: a #GtkCombo. +@item: a #GtkItem. +@item_value: the string to place in the #GtkEntry when @item is selected. +@Deprecated: 2.4: Use #GtkComboBox instead. + + + +Convenience function to set all of the items in the popup list. +(See the example above.) + + +@combo: a #GtkCombo. +@strings: a list of strings, or %NULL to clear the popup list +@Deprecated: 2.4: Use #GtkComboBox instead. + + + +Specifies if the arrow (cursor) keys can be used to step through the items in +the list. This is on by default. + + +@combo: a #GtkCombo. +@val: %TRUE if the arrow keys can be used to step through the items in + the list. +@Deprecated: 2.4: Use #GtkComboBox instead. + + + +Obsolete function, does nothing. + + +@combo: a #GtkCombo. +@val: unused +@Deprecated: 2.4: Use #GtkComboBox instead. + + + +Specifies whether the value entered in the text entry field must match one of +the values in the list. If this is set then the user will not be able to +perform any other action until a valid value has been entered. + + +If an empty field is acceptable, the @ok_if_empty parameter should be %TRUE. + + +@combo: a #GtkCombo. +@val: %TRUE if the value entered must match one of the values in the list. +@ok_if_empty: %TRUE if an empty value is considered valid. +@Deprecated: 2.4: Use #GtkComboBox instead. + + + + + + +@arg_name: +@arg_type: +@arg_flags: +@arg_id: + + + + + + +@container: +@widget: +@first_arg_name: +@Varargs: + + + + + + +@container: +@widget: +@n_args: +@args: + + + + + + +@container: +@child: +@arg: +@info: + + + + + + +@container: +@child: +@arg: +@info: + + + + + + +@object_type: +@arg_name: +@info_p: +@Returns: + + + + + + +@object_type: +@arg_list_p: +@info_list_p: +@first_arg_name: +@args: +@Returns: + + + + + + +@container: +@child: +@n_args: +@args: + + + + + + +@container: +@child: +@n_args: +@args: + + + + + + +@container: + + + + + + +@container: +@direction: +@Returns: + + + + + + +@class_type: +@arg_flags: +@nargs: +@Returns: + + + + + + +@window: + + + + + + +@window: + + + + + + +@window: +@x: +@y: +@width: +@height: + + + + + + +@window: +@title: + + + +Internal function. + + +@toplevel: +@event: + + + + + + +@colormap: +@pixmap: +@mask: +@hot_x: +@hot_y: + + + +Internal function. + + +@widget: +@event: + + + +Sets the size that the drawing area will request +in response to a "size_request" signal. The +drawing area may actually be allocated a size +larger than this depending on how it is packed +within the enclosing containers. + + +@darea: a #GtkDrawingArea +@width: the width to request +@height: the height to request +@Deprecated: Use gtk_widget_set_size_request() instead. + + + +Causes the "changed" signal to be emitted. + + +@editable: a #GtkEditable widget. + + + +Claim or disclaim ownership of the PRIMARY X selection. + + +@editable: a #GtkEditable widget. +@claim: if %TRUE, claim the selection, otherwise, disclaim it. +@time: the timestamp for claiming the selection. + + + + + + +@entry: +@icon_pos: +@Returns: + + + + + + +@entry: +@icon_pos: +@Returns: + + + + + + +@entry: +@icon_pos: +@Returns: + + + + + + +@entry: +@icon_pos: +@Returns: + + + + + + +@title: +@parent: +@action: +@backend: +@first_button_text: +@Varargs: +@Returns: + + + + + + + + + +@Returns: + + + + + + +@chooser: +@Returns: + + + + + + +@chooser: +@folder_mode: + + + + + + +@action: +@backend: +@Returns: + + + +Will attempt to match @pattern to a valid filenames or subdirectories in the current directory. If a match can be made, the matched filename will appear in the text entry field of the file selection dialog. +If a partial match can be made, the "Files" list will contain those +file names which have been partially matched, and the "Folders" +list those directories which have been partially matched. + + +@filesel: a #GtkFileSelection. +@pattern: a string of characters which may or may not match any filenames in the current directory. + + + + + +@filesel: +@Returns: + + + + + + +@filesel: +@Returns: + + + + + + +@filesel: +@Returns: + + + +Hides the file operation buttons that normally appear at the top of the dialog. Useful if you wish to create a custom file selector, based on #GtkFileSelection. + + +@filesel: a #GtkFileSelection. + + + +Creates a new file selection dialog box. By default it will contain a #GtkTreeView of the application's current working directory, and a file listing. Operation buttons that allow the user to create a directory, delete files and rename files, are also present. + + +@title: a message that will be placed in the file requestor's titlebar. +@Returns: the new file selection. +@Deprecated: Use gtk_file_chooser_dialog_new() instead + + + + + +@filesel: +@filename: + + + + + + +@filesel: +@select_multiple: + + + +Shows the file operation buttons, if they have previously been hidden. The rest of the widgets in the dialog will be resized accordingly. + + +@filesel: a #GtkFileSelection. + + + + + + +@fsd: +@Returns: + + + + + + +@fsd: +@Returns: + + + +Sets one of the two font filters, to limit the fonts shown. + + +@fsd: a #GtkFontSelectionDialog. +@filter_type: which of the two font filters to set, either +#GTK_FONT_FILTER_BASE or #GTK_FONT_FILTER_USER. The user filter +can be changed by the user, but the base filter is permanent. +@font_type: the types of font to be shown. This is a bitwise combination of +#GTK_FONT_BITMAP, #GTK_FONT_SCALABLE and #GTK_FONT_SCALABLE_BITMAP, +or #GTK_FONT_ALL to show all three font types. +@foundries: a NULL-terminated array of strings containing foundry names which +will be shown, or NULL to show all foundries. +@weights: a NULL-terminated array of strings containing weight names which +will be shown, or NULL to show all weights. +@slants: a NULL-terminated array of strings containing slant names which +will be shown, or NULL to show all slants. +@setwidths: a NULL-terminated array of strings containing setwidth names which +will be shown, or NULL to show all setwidths. +@spacings: a NULL-terminated array of strings containing spacings which +will be shown, or NULL to show all spacings. +@charsets: a NULL-terminated array of strings containing charset names which +will be shown, or NULL to show all charsets. + + + + + + +@fontsel: +@Returns: + + + + + + +@fontsel: +@Returns: + + + + + + +@fontsel: +@Returns: + + + +Sets one of the two font filters, to limit the fonts shown. + + +@fontsel: a #GtkFontSelection. +@filter_type: which of the two font filters to set, either +#GTK_FONT_FILTER_BASE or #GTK_FONT_FILTER_USER. The user filter +can be changed by the user, but the base filter is permanent. +@font_type: the types of font to be shown. This is a bitwise combination of +#GTK_FONT_BITMAP, #GTK_FONT_SCALABLE and #GTK_FONT_SCALABLE_BITMAP, +or #GTK_FONT_ALL to show all three font types. +@foundries: a NULL-terminated array of strings containing foundry names which +will be shown, or NULL to show all foundries. +@weights: a NULL-terminated array of strings containing weight names which +will be shown, or NULL to show all weights. +@slants: a NULL-terminated array of strings containing slant names which +will be shown, or NULL to show all slants. +@setwidths: a NULL-terminated array of strings containing setwidth names which +will be shown, or NULL to show all setwidths. +@spacings: a NULL-terminated array of strings containing spacings which +will be shown, or NULL to show all spacings. +@charsets: a NULL-terminated array of strings containing charset names which +will be shown, or NULL to show all charsets. + + + + + + +@Returns: + + + +Get the type of GtkIdentifier. + + +@Returns: GtkType -- the enumerated type of something. + + + + + + +@image_menu_item: +@child: + + + + + + +@Returns: + + + + + + +@ifactory_path: +@path: + + + + + + +@accel_widget: +@full_path: +@accel_group: +@keyval: +@modifiers: + + + + + + +@ifactory: +@container_type: +@path: +@accel_group: + + + + + + +@ifactory: +@entry: +@callback_data: +@callback_type: + + + + + + +@ifactory: +@n_entries: +@entries: +@callback_data: + + + + + + +@ifactory: +@n_entries: +@entries: +@callback_data: +@callback_type: + + + + + + +@n_entries: +@entries: + + + + + + +@ifactory: +@n_entries: +@entries: + + + + + + +@ifactory: +@entry: + + + + + + +@ifactory: +@path: + + + + + + +@path_pspec: +@modified_only: +@print_func: +@func_data: + + + + + + +@file_name: +@path_pspec: +@modified_only: + + + + + + +@path: +@Returns: + + + + + + +@widget: +@Returns: + + + + + + +@ifactory: +@path: +@Returns: + + + + + + +@ifactory: +@action: +@Returns: + + + + + + +@ifactory: +@path: +@Returns: + + + + + + +@ifactory: +@action: +@Returns: + + + + + + +@container_type: +@path: +@accel_group: +@Returns: + + + + + + +@file_name: + + + + + + +@scanner: + + + + + + +@rc_string: + + + + + + +@widget: +@Returns: + + + + + + +@ifactory: +@x: +@y: +@mouse_button: +@time_: + + + + + + +@ifactory: +@Returns: + + + + + + +@widget: +@Returns: + + + + + + +@ifactory: +@popup_data: +@destroy: +@x: +@y: +@mouse_button: +@time_: + + + + + + +@FILE_pointer: +@string: + + + + + + +@ifactory: +@func: +@data: +@notify: + + + +Gets the current string of text within the #GtkLabel and writes it to +the given @str argument. It does not make a copy of this string so you +must not write to it. + + +@label: The #GtkLabel widget you want to get the text from. +@str: The reference to the pointer you want to point to the text. +@Deprecated: Use gtk_label_get_text() instead. + + + +Sets the text within the GtkLabel widget. + + +@Deprecated: Use gtk_label_set_text() instead. + + + + + + +@label: +@str: +@Returns: + + + + + + +@layout: + + + + + + +@layout: + + + +Adds @items to the end of the @list. + + +@list: the list widget. +@items: the items. + + + +Searches the children of @list for the index of @child. + + +@list: the list widget. +@child: the child to look for. +@Returns: the index of the child, -1 if not found. + + + +Removes the items between index @start (included) and @end (excluded) +from the @list. If @end is negative, or greater than the number of +children of @list, it's assumed to be exactly the number of +elements. If @start is greater than or equal to @end, nothing is +done. + + +@list: the list widget. +@start: the index of the first item to remove. +@end: the index of the lest item to remove plus one. + + + +Stops the drag selection mode and ungrabs the pointer. This has no +effect if a drag selection is not active. + + +@list: the list widget. + + + +Ends the selection. Used with gtk_list_extend_selection() and +gtk_list_start_selection(). Only in #GTK_SELECTION_EXTENDED mode. + + +@list: the list widget. + + + +Extends the selection by moving the anchor according to @scroll_type. Only +in #GTK_SELECTION_EXTENDED. + + +@list: the list widget. +@scroll_type: the direction and length. +@position: the position if @scroll_type is #GTK_SCROLL_JUMP. +@auto_start_selection: if %TRUE, gtk_list_start_selection() is automatically +carried out before extending the selection. + + + +Inserts @items into the @list at the position @position. The #GList items +must not be freed after. + + +@list: the list widget. +@items: the items. +@position: the position to insert @items, starting at 0. + + + +Deselects the item, by emitting the item's "deselect" signal. + + +@list_item: a #GtkListItem. + + + +Creates a new #GtkListitem. + + +@Returns: a new #GtkListItem. + + + +Creates a new #GtkListItem with a child label containing the given string. + + +@label: the string to use for the child label. +@Returns: a new #GtkListItem with a child #GtkLabel with the text set to +@label. + + + +Selects the item, by emitting the item's "select" signal. +Depending on the selection mode of the list, this may cause other items to +be deselected. + + +@list_item: a #GtkListItem. + + + +Creates a new #GtkList. + + +@Returns: the newly-created #GtkList + + + +Inserts @items at the beginning of the @list. + + +@list: the list widget. +@items: the items. + + + +Removes the @items from the @list. + + +@list: the list widget. +@items: the items to remove. + + + +Removes the @items from the @list, without unreferencing them. It +may be useful if you want to move the items from one list to another. + + +@list: the list widget. +@items: the items. + + + +Scrolls @list horizontaly. This supposes that the list is packed into a +scrolled window or something similar, and adjustments are well +set. Step and page increment are those from the horizontal adjustment +of @list. Backward means to the left, and forward to the +right. Out of bounds values are truncated. +@scroll_type may be any valid #GtkScrollType. If @scroll_type is +#GTK_SCROLL_NONE, nothing is done. If it's #GTK_SCROLL_JUMP, the list +scrolls to the ratio @position: 0 is full left, 1 is full right. + + +@list: the list widget. +@scroll_type: the scrolling type. +@position: the position if @scroll_type is #GTK_SCROLL_JUMP + + + +Scrolls @list vertically. This supposes that the list is packed into a +scrolled window or something similar, and adjustments are well +set. Step and page increment are those from the vertical adjustment +of @list. Backward means up, and forward down. Out of bounds values are +truncated. +@scroll_type may be any valid #GtkScrollType. If @scroll_type is +#GTK_SCROLL_NONE, nothing is done. If it's #GTK_SCROLL_JUMP, the list +scrolls to the ratio @position: 0 is top, 1 is bottom. + + +@list: the list widget. +@scroll_type: the scrolling type. +@position: the position if @scroll_type is #GTK_SCROLL_JUMP + + + +Selects all children of @list. A signal will be emitted for each +newly selected child. + + +@list: the list widget. + + + +Selects the given @child. The signal GtkList::select-child will be +emitted. + + +@list: the list widget +@child: the child to select. + + + +Selects the child number @item of the @list. Nothing happens if @item +is out of bounds. The signal GtkList::select-child will be emitted. + + +@list: the list widget. +@item: the index of the child to select. + + + +Set the list selection mode. The selection mode can be any value in +#GtkSelectionMode: + + +#GTK_SELECTION_SINGLE + +Zero or one element may be selected. + + + + +#GTK_SELECTION_BROWSE + +Exactly one element is always selected (this can be false after you have +changed the selection mode). + + + + +#GTK_SELECTION_MULTIPLE + +Any number of elements may be selected. Clicks toggle the state of an +item. + + + + +#GTK_SELECTION_EXTENDED + +Any number of elements may be selected. Click-drag selects a range of +elements; the Ctrl key may be used to enlarge the selection, and +Shift key to select between the focus and the child pointed to. + + + + + +@list: the list widget. +@mode: the new selection mode. + + + +Starts a selection (or part of selection) at the focused child. Only in +#GTK_SELECTION_EXTENDED mode. + + +@list: the list widget. + + + + + + +@store: +@iter: +@position: + + + + + + +@n_columns: +@Varargs: +@Returns: + + + + + + +@store: +@iter: +@column: +@value: + + + + + + +@store: +@column: +@type: + + + + + + +@store: +@n_columns: + + + +Toggles between adding to the selection and beginning a new selection. Only +in #GTK_SELECTION_EXTENDED. Useful with gtk_list_extend_selection(). + + +@list: the list widget. + + + +Toggles the focus row. If the focus row is selected, it's +unselected. If the focus row is unselected, it's selected. If the +selection mode of @list is #GTK_SELECTION_BROWSE, this has no effect, +as the selection is always at the focus row. + + +@list: the list widget. + + + +Toggles the child @item of list. If the selection mode of @list is +#GTK_SELECTION_BROWSE, the item is selected, and the others are +unselected. + + +@list: the list widget. +@item: the child to toggle. + + + +Restores the selection in the last state, only if selection mode is +#GTK_SELECTION_EXTENDED. If this function is called twice, the selection is +cleared. This function sometimes gives stranges "last states". + + +@list: the list widget. + + + +Unselects all children of @list. A signal will be emitted for each +newly unselected child. + + +@list: the list widget. + + + +Unselects the given @child. The signal GtkList::unselect-child will be +emitted. + + +@list: the list widget. +@child: the child to unselect. + + + +Unselects the child number @item of the @list. Nothing happens if +@item is out of bounds. The signal GtkList::unselect-child will be +emitted. + + +@list: the list widget. +@item: the index of the child to unselect. + + + +Adds a new #GtkMenuItem to the end of the GtkMenuBar + + +@menu: a #GtkMenuBar +@child: the #GtkMenuItem to add +@Deprecated: Use gtk_menu_shell_append() instead. + + + +Adds a new #GtkMenuItem to the GtkMenuBar at the position defined by @position + + +@menu: a #GtkMenuBar +@child: the #GtkMenuItem to add +@pos: the position in the item list where the @child is added. +@Deprecated: Use gtk_menu_shell_insert() instead. + + + +Adds a new #GtkMenuItem to the beginning of the GtkMenuBar + + +@menu: a #GtkMenuBar +@child: the #GtkMenuItem to add +@Deprecated: Use gtk_menu_shell_prepend() instead. + + + + + + +@menu: +@Returns: + + + + + + +@menu: +@Returns: + + + +Sets whether the menu item should show a submenu indicator, which is a right +arrow. + + +@menu_item: the menu item +@show_toggle_indicator: unused +@show_submenu_indicator: whether to show the arrow or not + + + + + + +@menu_item: + + + +Sets the menu item to be right-justified. Only useful for menu bars. + + +@menu_item: the menu item + + + +Specifies the placement of the submenu around the menu item. The placement +is usually #GTK_LEFT_RIGHT for menu items in a popup menu and +#GTK_TOP_BOTTOM in menu bars. + + +This function is useless in usual applications. + + +@menu_item: the menu item +@placement: the submenu placement + + + + + + +@button: +@tooltips: +@tip_text: +@tip_private: + + + +Deprecated compatibility macro. + + +@Deprecated: Use gtk_notebook_get_current_page() instead. + + + + + + +@notebook: +@Returns: + + + + + + +@notebook: +@group_id: + + + + + +@notebook: +@homogeneous: + + + +Deprecated compatibility macro. + + +@Deprecated: Use gtk_notebook_set_current_page() instead. + + + + + +@notebook: +@border_width: + + + + + +@notebook: +@tab_hborder: + + + + + +@notebook: +@tab_vborder: + + + +Deprecated in favor of the #GObject property system including #GParamSpec. +Add a new type of argument to an object class. +Usually this is called when registering a new type of object. + + +@arg_name: fully qualify object name, for example GtkObject::user_data. +@arg_type: type of the argument. +@arg_flags: bitwise-OR of the #GtkArgFlags enum. (Whether the argument is +settable or gettable, whether it is set when the object is constructed.) +@arg_id: an internal number, passed in from here to the "set_arg" and +"get_arg" handlers of the object. + + + +Private function to get an argument and argument info from an object. + + +@object: the object whose argument should be retrieved. +@arg: the argument, for the name on input, the rest is filled on output. +@info: a #GtkArgInfo structure to optionally fill in. + + + +Query information about an argument type. + + +@object_type: type of object to query about. +@arg_name: name of the argument. +@info_p: pointer to be filled in with a pointer to the GtkArgInfo. +@Returns: an error message, or NULL on success. +It is the caller's responsibility to call g_free() in the event of error. + + + +Private function to set an argument and argument info to an object. + + +@object: the object whose argument should be set. +@arg: the argument. +@info: infomation about this type of argument in general. + + + +Private: Gets an array of #GtkArgs from a va_list C structure. + + +@object_type: the type of object to collect arguments for. +@arg_list_p: pointer to be filled in with a list of parsed arguments. +@info_list_p: optional pointer for a returned list #GtkArgInfos. +@first_arg_name: name of first argument. +@var_args: value of first argument, followed by more key/value pairs, +terminated by NULL. +@Returns: an error message, or NULL on success. +It is the caller's responsibility to call g_free() in the event of error. + + + +Add an array of signals to a #GtkObjectClass. +Usually this is called when registering a new type of object. + + +@klass: the object class to append signals to. +@signals: the signals to append. +@nsignals: the number of signals being appended. + + + +Define a signal-handler for a new signal on an already defined +object. + + +See the signal documentation for more general information. + + +@klass: the object class to define the signal for. +@name: the name of the signal. +@signal_flags: the default emission behavior for the signal. +See g_signal_new(). +@marshaller: a function that will take an array of GtkArgs +and invoke the appropriate handler with the normal calling +conventions. +@return_val: specify the return-value type for the signal +(or GTK_TYPE_NONE for no return-value). +@nparams: specify the number of parameters the signal +receives from the caller of g_signal_emit(). +@Varargs: list of nparams #GtkTypes to pass to the signal handlers. +@Returns: the signal id. (See #GtkSignals) + + + +Define a signal-handler for a new signal on an already defined +object. + + +@klass: the object class to define the signal for. +@name: the name of the signal. +@signal_flags: the default emission behavior for the signal. +See g_signal_new(). +@marshaller: takes a GtkObject, a #GtkSignalFunc, and an array +of arguments, and invokes the function using the appropriate +calling conventions. Usually just select a function +out of gtkmarshal.h. +@return_val: specify the return-value type for the signal (possibly +#GTK_TYPE_NONE). +@nparams: specify the number of parameters the signal +receives from the caller of g_signal_emit(). +@params: array of #GtkTypes the signal handlers for this signal +should have in their prototype (of length nparams). +@Returns: the signal id. (See #GtkSignals) + + + +Mark an allocated object as constructed. +This is used for situations +that require precise control of the construction process. + + +This is done when gtk_object_default_construct() is inadequate. +In #GtkCList the need arises because #GtkCList does construction work that +must happen after its derivers. This work +cannot be done in an initializer function, so an alternate +constructor is mandatory. It calls gtk_object_constructed() to +indicate it has done its job, so that no other constructor will +be invoked. + + +Normally this function is just automatically run from +gtk_object_default_construct(). + + +@object: object which has been constructed. This is usually +done automatically by gtk_object_new() and gtk_object_newv(). + + + +Useless deprecated macro. Ignore it. + + + + + +Useless deprecated macro. Ignore it. + + + + + +This function is called to construct arguments that haven't been initialized +but have the #GTK_ARG_CONSTRUCT flag set. + + +All number arguments are set to 0. All pointers and strings +are set to NULL. + + +Normally invoked by gtk_object_new() automatically; gtk_type_new() can +be used to bypass it. -@min_width: minimum default width for child buttons. -@min_height: minimum default height for child buttons. +@object: the object to initialize. - + - +Gets properties of an object. -@uline_label: -@accel_group: -@Returns: +@object: a #GtkObject. +@first_property_name: name of first property to get the value for. +@Varargs: %NULL-terminated list of name-return location pairs. +@Deprecated: Use g_object_get() instead. - + - +Get a named field from the object's table of associations (the object_data). -@stock_id: -@accel_group: -@Returns: +@object: the object maintaining the associations. +@key: name of the key for that association. +@Returns: the data if found, or %NULL if no such data exists. +@Deprecated: Use g_object_get_data() instead. - + - +Just like gtk_object_get_data() except that it takes +a #GQuark instead of a string, so it is slightly faster. - -@cell: -@event: -@widget: -@path: -@background_area: -@cell_area: -@flags: -@Returns: - - - +Use gtk_object_data_try_key() and gtk_object_data_force_id() +to get an id from a string. -@Returns: +@object: object containing the associations. +@data_id: quark of the key. +@Returns: the data if found, or %NULL if no such data exists. +@Deprecated: Use g_object_get_qdata() instead. - + - +Get the object's user data pointer. + + +This is intended to be a pointer for your convenience in +writing applications. -@cell_view: -@Returns: +@object: the object. +@Returns: the user data field for object. +@Deprecated: Use g_object_get_data() instead. - + - +Gets an array of argument values from an object. -@cell_view: -@cellview: +@object: the object to get arguments from. +@n_args: the number of arguments to query. +@args: the arguments to fill in. - + - +Constructs an object given its arguments, enumerated in the call to the +function. -@cell_view: -@use_fg: +@type: the type identifying this object. Returned by gtk_type_unique() +(although for a properly-written object it should be accessible through +a #GTK_TYPE_FOO macro.) +@first_property_name: name of the first property to set when constructing + the object. +@Varargs: the first argument's value, followed by any number of +name/argument-value pairs, terminated with %NULL. +@Returns: the new #GtkObject. +@Deprecated: Use g_object_new() instead. - + -Initializes a previously allocated #GtkCList widget for use. This should not -normally be used to create a #GtkCList widget. Use gtk_clist_new() instead. +Construct an object with an array of arguments. -@clist: A pointer to an uninitialized #GtkCList widget. -@columns: The number of columns the #GtkCList should have. -@titles: An array of strings that should be used as the titles i -of the columns. There should be enough strings in the array for -the number of columns specified. +@object_type: the type of the object to create. +@n_args: the number of arguments to set. +@args: an array of n_args arguments (which are name and value pairs). +@Returns: the new GtkObject. - + - +Get all the arguments that may be used for a given type. + + +In Java, this type of mechanism is called +introspection. It is used by applications +like Glade, that have to determine what can be done to an object +at run-time. -@colorsel: -@color: +@class_type: the GtkType of the ObjectClass +(returned from GTK_OBJECT_CLASS(class)->type for example). +@arg_flags: if non-NULL, obtains the #GtkArgFlags that apply to +each argument. You must g_free() this if you request it. +@n_args: the number of arguments is returned in this field. +@Returns: an array of arguments, that you must deallocate with g_free(). - + - +Increases the reference count of the object. -@colorsel: -@Returns: +@object: the object to reference. +@Returns: @object. +@Deprecated: Use g_object_ref() instead. - + - +Removes a specified datum from the object's data associations (the object_data). +Subsequent calls to gtk_object_get_data() will return %NULL. + + +If you specified a destroy handler with gtk_object_set_data_full(), +it will be invoked. -@colorsel: -@Returns: +@object: the object maintaining the association. +@key: name of the key for that association. +@Deprecated: Use g_object_set_data() to set the object data to %NULL instead. - + - +Just like gtk_object_remove_data() except that it takes +a #GQuark instead of a string, so it is slightly faster. + + +Remove a specified datum from the object's data associations. +Subsequent calls to gtk_object_get_data() will return %NULL. + + +Use gtk_object_data_try_key() and gtk_object_data_force_id() +to get an id from a string. -@colorsel: -@color: +@object: object containing the associations. +@data_id: quark of the key. +@Deprecated: Use g_object_set_qdata() with data of %NULL instead. - + -Controls whether opacity can be set with the #GtkColorSelection. -If this functionality is enabled, the necessary additional widgets -are added to the #GtkColorSelection and the opacity value can be -retrieved via the fourth value in the color array returned by -the gtk_color_selection_get_color() function. +Remove a specified datum from the object's data associations (the object_data), +without invoking the association's destroy handler. + + +Just like gtk_object_remove_data() except that any destroy handler +will be ignored. +Therefore this only affects data set using gtk_object_set_data_full(). -@colorsel: a #GtkColorSelection. -@use_opacity: a boolean indicating whether the opacity selection -is enabled. +@object: the object maintaining the association. +@key: name of the key for that association. +@Deprecated: Use g_object_steal_data() instead. - + - +Just like gtk_object_remove_no_notify() except that it takes +a #GQuark instead of a string, so it is slightly faster. + + +Use gtk_object_data_try_key() and gtk_object_data_force_id() +to get an id from a string. -@colorsel: -@use_opacity: +@object: object containing the associations. +@key_id: quark of the key. +@Deprecated: Use g_object_steal_qdata() instead. - + - +Sets properties on an object. + + + + +void set_box_properties (GtkBox* box) +{ + gtk_object_set (GTK_OBJECT (box), "homogeneous", TRUE, + "spacing", 8, + NULL); +} + + -@colorsel: -@use_palette: +@object: a #GtkObject. +@first_property_name: name of the first property to set +@Varargs: the value of the first argument, followed optionally +by more name/value pairs, followed by %NULL. +@Deprecated: Use g_object_set() instead. - + - +Each object carries around a table of associations from +strings to pointers. This function lets you set an association. + + +If the object already had an association with that name, +the old association will be destroyed. -@combo_box: -@Returns: +@object: object containing the associations. +@key: name of the key. +@data: data to associate with that key. +@Deprecated: Use g_object_set_data() instead. - + - +Just like gtk_object_set_data() except that it takes +a #GQuark instead of a string, so it is slightly faster. + + +Use gtk_object_data_try_key() and gtk_object_data_force_id() +to get an id from a string. -@combo_box: -@column: +@object: object containing the associations. +@data_id: quark of the key. +@data: data to associate with that key. +@Deprecated: Use g_object_set_qdata() instead. - + - +Just like gtk_object_set_data_full() except that it takes +a #GQuark instead of a string, so it is slightly faster. + + +Use gtk_object_data_try_key() and gtk_object_data_force_id() +to get an id from a string. -@arg_name: -@arg_type: -@arg_flags: -@arg_id: +@object: object containing the associations. +@data_id: quark of the key. +@data: data to associate with that key. +@destroy: function to call when the association is destroyed. +@Deprecated: Use g_object_set_qdata_full() instead. - + - +Like gtk_object_set_data() except it adds notification +for when the association is destroyed, either by +gtk_object_remove_data() or when the object is destroyed. -@container: -@widget: -@first_arg_name: -@Varargs: +@object: object containing the associations. +@key: name of the key. +@data: data to associate with that key. +@destroy: function to call when the association is destroyed. +@Deprecated: Use g_object_set_data_full() instead. - + - +For convenience, every object offers a generic user data +pointer. This function sets it. -@container: -@widget: -@n_args: -@args: +@object: the object whose user data should be set. +@data: the new value for the user data. +@Deprecated: Use g_object_set_data() instead. - + - +Set an array of arguments. -@container: -@child: -@arg: -@info: +@object: the object whose arguments should be set. +@n_args: the number of arguments to set. +@args: the desired values, as an array of #GtkArgs (which contain +the names, types, and values of the arguments). - + - +Removes the floating reference from a #GtkObject, if it exists; +otherwise does nothing. See the #GtkObject overview documentation at +the top of the page. -@container: -@child: -@arg: -@info: +@object: the object to sink. +@Deprecated: 2.10: Use g_object_ref_sink() instead - + - +Decreases the reference count of an object. When its reference count drops +to 0, the object is finalized (i.e. its memory is freed). -@object_type: -@arg_name: -@info_p: -@Returns: +@object: the object to dereference. +@Deprecated: Use g_object_unref() instead. - + - +Adds a weak reference callback to an object. Weak references are used for notification when an object is +finalized. They are called "weak references" because they allow you to safely +hold a pointer to an object without calling g_object_ref() (g_object_ref() adds +a strong reference, that is, forces the object to stay alive). -@object_type: -@arg_list_p: -@info_list_p: -@first_arg_name: -@args: -@Returns: +@object: object to weakly reference. +@notify: callback to invoke before the object is freed. +@data: extra data to pass to #notify. +@Deprecated: Use g_object_weak_ref() instead. - + - +Removes a weak reference callback to an object. -@container: -@child: -@n_args: -@args: +@object: object stop weakly referencing. +@notify: callback to search for. +@data: data to search for. +@Deprecated: Use g_object_weak_unref() instead. - + -@container: +@packer: @child: -@n_args: -@args: +@side: +@anchor: +@options: +@border_width: +@pad_x: +@pad_y: +@i_pad_x: +@i_pad_y: - + -@container: +@packer: +@child: +@side: +@anchor: +@options: - + -@container: -@direction: -@Returns: - + -@class_type: -@arg_flags: -@nargs: @Returns: - + -@window: +@packer: +@child: +@position: - + -@window: +@packer: +@child: +@side: +@anchor: +@options: +@border_width: +@pad_x: +@pad_y: +@i_pad_x: +@i_pad_y: - + -@window: -@x: -@y: -@width: -@height: +@packer: +@border: - + -@window: -@title: +@packer: +@i_pad_x: +@i_pad_y: - + -Internal function. + -@toplevel: -@event: +@packer: +@pad_x: +@pad_y: - + -Internal function. + -@widget: -@event: +@packer: +@spacing: - + -Causes the "changed" signal to be emitted. + -@editable: a #GtkEditable widget. +@style: +@window: +@state_type: +@area: +@widget: +@detail: +@x: +@y: +@string: - + -Claim or disclaim ownership of the PRIMARY X selection. +Old name for gtk_paned_set_handle_size(). -@editable: a #GtkEditable widget. -@claim: if %TRUE, claim the selection, otherwise, disclaim it. -@time: the timestamp for claiming the selection. - + - +Set the the handle size to @size x @size pixels. -@entry: -@icon_pos: -@Returns: +@paned: a paned widget +@size: the size in pixels - + -@entry: -@icon_pos: +@pspec: +@string_length: +@string: +@string_reversed: @Returns: - + -@entry: -@icon_pos: +@pattern: +@string: @Returns: - + -@entry: -@icon_pos: +@pspec: +@string: @Returns: - + -@Returns: +@pspec: - + -@chooser: -@Returns: +@pspec: +@pattern: - + - +Sets the data for a portion of a row. -@chooser: -@folder_mode: +@preview: a #GtkPreview. +@data: the new data for the portion. It should contain + @w bytes of data if the preview is of type + GTK_TYPE_GRAYSCALE, and 3*@w bytes of data + if the preview is of type GTK_TYPE_COLOR. +@x: the starting value on the row to set. +@y: the row to change. +@w: the number of pixels in the row to change. - + -Sets one of the two font filters, to limit the fonts shown. +Returns the colormap used by preview widgets. This +function is deprecated, and you should use +gdk_rgb_get_cmap() instead. -@fsd: a #GtkFontSelectionDialog. -@filter_type: which of the two font filters to set, either -#GTK_FONT_FILTER_BASE or #GTK_FONT_FILTER_USER. The user filter -can be changed by the user, but the base filter is permanent. -@font_type: the types of font to be shown. This is a bitwise combination of -#GTK_FONT_BITMAP, #GTK_FONT_SCALABLE and #GTK_FONT_SCALABLE_BITMAP, -or #GTK_FONT_ALL to show all three font types. -@foundries: a NULL-terminated array of strings containing foundry names which -will be shown, or NULL to show all foundries. -@weights: a NULL-terminated array of strings containing weight names which -will be shown, or NULL to show all weights. -@slants: a NULL-terminated array of strings containing slant names which -will be shown, or NULL to show all slants. -@setwidths: a NULL-terminated array of strings containing setwidth names which -will be shown, or NULL to show all setwidths. -@spacings: a NULL-terminated array of strings containing spacings which -will be shown, or NULL to show all spacings. -@charsets: a NULL-terminated array of strings containing charset names which -will be shown, or NULL to show all charsets. +@Returns: the colormap for previews. - + - +Return a #GtkPreviewInfo structure containing +global information about preview widgets. -@fontsel: -@Returns: +@Returns: a #GtkPreviewInfo structure. The return + value belongs to GTK+ and must not be modified + or freed. - + - +Returns the visual used by preview widgets. This +function is deprecated, and you should use +gdk_rgb_get_visual() instead. -@fontsel: -@Returns: +@Returns: the visual for previews. - + -Sets one of the two font filters, to limit the fonts shown. +Create a new preview widget. -@fontsel: a #GtkFontSelection. -@filter_type: which of the two font filters to set, either -#GTK_FONT_FILTER_BASE or #GTK_FONT_FILTER_USER. The user filter -can be changed by the user, but the base filter is permanent. -@font_type: the types of font to be shown. This is a bitwise combination of -#GTK_FONT_BITMAP, #GTK_FONT_SCALABLE and #GTK_FONT_SCALABLE_BITMAP, -or #GTK_FONT_ALL to show all three font types. -@foundries: a NULL-terminated array of strings containing foundry names which -will be shown, or NULL to show all foundries. -@weights: a NULL-terminated array of strings containing weight names which -will be shown, or NULL to show all weights. -@slants: a NULL-terminated array of strings containing slant names which -will be shown, or NULL to show all slants. -@setwidths: a NULL-terminated array of strings containing setwidth names which -will be shown, or NULL to show all setwidths. -@spacings: a NULL-terminated array of strings containing spacings which -will be shown, or NULL to show all spacings. -@charsets: a NULL-terminated array of strings containing charset names which -will be shown, or NULL to show all charsets. +@type: the type data contained by the widget. +(Grayscale or RGB) +@Returns: a new #GtkPreview - + - +Takes a portion of the contents of a preview widget +and draws it onto the given drawable, @window. -@Returns: +@preview: a #GtkPreview. +@window: a window or pixmap. +@gc: The graphics context for the operation. Only the + clip mask for this GC matters. +@srcx: the x coordinate of the upper left corner in the source image. +@srcy: the y coordinate of the upper left corner in the source image. +@destx: the x coordinate of the upper left corner in the destination image. +@desty: the y coordinate of the upper left corner in the destination image. +@width: the width of the rectangular portion to draw. +@height: the height of the rectangular portion to draw. - + -Get the type of GtkIdentifier. +This function is deprecated and does nothing. It was +once used for changing the colormap and visual on the fly. -@Returns: GtkType -- the enumerated type of something. - + - +This function is deprecated and does nothing. GdkRGB +automatically picks an optimium color cube for the +display. -@image_menu_item: -@child: +@nred_shades: ignored +@ngreen_shades: ignored +@nblue_shades: ignored +@ngray_shades: ignored - + - +Set the dithering mode for the display. -@Returns: +@preview: a #GtkPreview. +@dither: the dithering mode. - + - +Determines the way that the the preview widget behaves +when the size it is allocated is larger than the requested +size. If @expand is %FALSE, then the preview's window +and buffer will be no larger than the size set with +gtk_preview_size(), and the data set will be centered +in the allocation if it is larger. If @expand is %TRUE +then the window and buffer will expand with the allocation; +the application is responsible for catching +the "size_allocate" signal and providing the data +appropriate for this size. -@path_pspec: -@modified_only: -@print_func: -@func_data: +@preview: a #GtkPreview. +@expand: whether the preview's window should expand or not. - + - +Set the gamma-correction value for all preview widgets. +(This function will eventually be replaced with a +function that sets a per-preview-widget gamma value). +The resulting intensity is given by: +destination_value * pow (source_value/255, 1/gamma). +The gamma value is applied when the data is +set with gtk_preview_draw_row() so changing this +value will not affect existing data in preview +widgets. -@file_name: -@path_pspec: -@modified_only: +@gamma_: the new gamma value. - + - +This function is deprecated +and does nothing. GdkRGB will automatically pick +a private colormap if it cannot allocate sufficient +colors. -@file_name: +@install_cmap: ignored. - + - +This function is deprecated and does nothing. -@scanner: +@nreserved: ignored. - + - +Set the size that the preview widget will request +in response to a "size_request" signal. The +drawing area may actually be allocated a size +larger than this depending on how it is packed +within the enclosing containers. The effect +of this is determined by whether the preview +is set to expand or not (see gtk_preview_expand()) -@rc_string: +@preview: a #GtkPreview. +@width: the new width. +@height: the new height. - + - +This function is deprecated and does nothing. -@FILE_pointer: -@string: - + -@label: -@str: +@context: @Returns: - + -@store: -@iter: -@position: +@context: +@Returns: - + -@n_columns: -@Varargs: +@context: @Returns: - + -@store: -@iter: -@column: -@value: +@context: +@Returns: - + -@store: -@column: -@type: +@op: +@n_pages: - + -@store: -@n_columns: +@settings: +@Returns: - + -@menu: +@settings: @Returns: - + -@menu: -@Returns: +@settings: +@num_copies: - + -Sets whether the menu item should show a submenu indicator, which is a right -arrow. - - -@menu_item: the menu item -@show_toggle_indicator: unused -@show_submenu_indicator: whether to show the arrow or not - - -Specifies the placement of the submenu around the menu item. The placement -is usually #GTK_LEFT_RIGHT for menu items in a popup menu and -#GTK_TOP_BOTTOM in menu bars. - - -This function is useless in usual applications. -@menu_item: the menu item -@placement: the submenu placement +@settings: +@print_to_file: - - -Private function to get an argument and argument info from an object. - + -@object: the object whose argument should be retrieved. -@arg: the argument, for the name on input, the rest is filled on output. -@info: a #GtkArgInfo structure to optionally fill in. - +@adjustment: +@Returns: + + -Query information about an argument type. +Sets the number of blocks used when the progress bar is in activity +mode. Larger numbers make the visible block smaller. -@object_type: type of object to query about. -@arg_name: name of the argument. -@info_p: pointer to be filled in with a pointer to the GtkArgInfo. -@Returns: an error message, or NULL on success. -It is the caller's responsibility to call g_free() in the event of error. +@pbar: a #GtkProgressBar. +@blocks: number of blocks which can fit within the progress bar area. - + -Private function to set an argument and argument info to an object. +Sets the step value used when the progress bar is in activity +mode. The step is the amount by which the progress is incremented +each iteration. -@object: the object whose argument should be set. -@arg: the argument. -@info: infomation about this type of argument in general. +@pbar: a #GtkProgressBar. +@step: the amount which the progress is incremented in activity +mode. - + -Private: Gets an array of #GtkArgs from a va_list C structure. +Sets the style of the #GtkProgressBar. The default style is +%GTK_PROGRESS_CONTINUOUS. -@object_type: the type of object to collect arguments for. -@arg_list_p: pointer to be filled in with a list of parsed arguments. -@info_list_p: optional pointer for a returned list #GtkArgInfos. -@first_arg_name: name of first argument. -@var_args: value of first argument, followed by more key/value pairs, -terminated by NULL. -@Returns: an error message, or NULL on success. -It is the caller's responsibility to call g_free() in the event of error. +@pbar: a #GtkProgressBar. +@style: a #GtkProgressBarStyle value indicating the desired style. - + -Add an array of signals to a #GtkObjectClass. -Usually this is called when registering a new type of object. +Sets the number of blocks that the progress bar is divided into +when the style is %GTK_PROGRESS_DISCRETE. -@klass: the object class to append signals to. -@signals: the signals to append. -@nsignals: the number of signals being appended. +@pbar: a #GtkProgressBar. +@blocks: number of individual blocks making up the bar. - + -Define a signal-handler for a new signal on an already defined -object. +This function is deprecated. Please use gtk_progress_set_value() or +gtk_progress_set_percentage() instead. + +@pbar: a #GtkProgressBar. +@percentage: the new percent complete value. + + -See the signal documentation for more general information. +Deprecated compatibility macro. Use gtk_radio_menu_item_get_group() instead. -@klass: the object class to define the signal for. -@name: the name of the signal. -@signal_flags: the default emission behavior for the signal. -See g_signal_new(). -@marshaller: a function that will take an array of GtkArgs -and invoke the appropriate handler with the normal calling -conventions. -@return_val: specify the return-value type for the signal -(or GTK_TYPE_NONE for no return-value). -@nparams: specify the number of parameters the signal -receives from the caller of g_signal_emit(). -@Varargs: list of nparams #GtkTypes to pass to the signal handlers. -@Returns: the signal id. (See #GtkSignals) - + -Define a signal-handler for a new signal on an already defined -object. +Adds a #GtkRcStyle that will be looked up by a matching against +the class hierarchy of the widget. This is equivalent to a: +class PATTERN style STYLE +statement in a RC file. -@klass: the object class to define the signal for. -@name: the name of the signal. -@signal_flags: the default emission behavior for the signal. -See g_signal_new(). -@marshaller: takes a GtkObject, a #GtkSignalFunc, and an array -of arguments, and invokes the function using the appropriate -calling conventions. Usually just select a function -out of gtkmarshal.h. -@return_val: specify the return-value type for the signal (possibly -#GTK_TYPE_NONE). -@nparams: specify the number of parameters the signal -receives from the caller of g_signal_emit(). -@params: array of #GtkTypes the signal handlers for this signal -should have in their prototype (of length nparams). -@Returns: the signal id. (See #GtkSignals) +@rc_style: the #GtkRcStyle to use for widgets deriving from @pattern +@pattern: the pattern +@Deprecated: Use gtk_rc_parse_string() with a suitable string instead. - + -Mark an allocated object as constructed. -This is used for situations -that require precise control of the construction process. +Adds a #GtkRcStyle that will be looked up by a match against +the widget's class pathname. This is equivalent to a: +widget_class PATTERN style STYLE +statement in a RC file. + +@rc_style: the #GtkRcStyle to use for widgets matching @pattern +@pattern: the pattern +@Deprecated: Use gtk_rc_parse_string() with a suitable string instead. + + -This is done when gtk_object_default_construct() is inadequate. -In #GtkCList the need arises because #GtkCList does construction work that -must happen after its derivers. This work -cannot be done in an initializer function, so an alternate -constructor is mandatory. It calls gtk_object_constructed() to -indicate it has done its job, so that no other constructor will -be invoked. +Adds a #GtkRcStyle that will be looked up by a match against +the widget's pathname. This is equivalent to a: + widget PATTERN style STYLE +statement in a RC file. + +@rc_style: the #GtkRcStyle to use for widgets matching @pattern +@pattern: the pattern +@Deprecated: Use gtk_rc_parse_string() with a suitable string instead. + + -Normally this function is just automatically run from -gtk_object_default_construct(). +Internal function. -@object: object which has been constructed. This is usually -done automatically by gtk_object_new() and gtk_object_newv(). - + -This function is called to construct arguments that haven't been initialized -but have the #GTK_ARG_CONSTRUCT flag set. +Internal function. Loads an image using the current +image loader. + +@colormap: the colormap to use for the image +@transparent_color: the transparent color for the image +@filename: the filename of the image file +@Returns: a #GtkPixmap representing @filename + + -All number arguments are set to 0. All pointers and strings -are set to NULL. +Sets the function that GTK+ will use to load images + +@loader: the #GtkImageLoader to use + + -Normally invoked by gtk_object_new() automatically; gtk_type_new() can -be used to bypass it. +Increments the reference count of a #GtkRcStyle. -@object: the object to initialize. +@rc_style: a #GtkRcStyle +@Deprecated: Use g_object_ref() instead - + -Gets an array of argument values from an object. +Decrements the reference count of a #GtkRcStyle and +frees if the result is 0. -@object: the object to get arguments from. -@n_args: the number of arguments to query. -@args: the arguments to fill in. +@rc_style: a #GtkRcStyle +@Deprecated: Use g_object_unref() instead - + -Construct an object with an array of arguments. + -@object_type: the type of the object to create. -@n_args: the number of arguments to set. -@args: an array of n_args arguments (which are name and value pairs). -@Returns: the new GtkObject. +@chooser: +@Returns: - + -Get all the arguments that may be used for a given type. + + +@chooser: +@show_numbers: + + -In Java, this type of mechanism is called -introspection. It is used by applications -like Glade, that have to determine what can be done to an object -at run-time. + -@class_type: the GtkType of the ObjectClass -(returned from GTK_OBJECT_CLASS(class)->type for example). -@arg_flags: if non-NULL, obtains the #GtkArgFlags that apply to -each argument. You must g_free() this if you request it. -@n_args: the number of arguments is returned in this field. -@Returns: an array of arguments, that you must deallocate with g_free(). +@screen: +@Returns: - + -Set an array of arguments. + -@object: the object whose arguments should be set. -@n_args: the number of arguments to set. -@args: the desired values, as an array of #GtkArgs (which contain -the names, types, and values of the arguments). +@manager: +@screen: - + -@packer: -@child: -@side: -@anchor: -@options: -@border_width: -@pad_x: -@pad_y: -@i_pad_x: -@i_pad_y: +@ruler: the gtkruler - + -@packer: -@child: -@side: -@anchor: -@options: +@ruler: the gtkruler - + +@button: +@Returns: - + +@button: +@orientation: + + + + + +@widget: +@event: @Returns: - + +Internal function. + + +@window: +@event: +@Returns: + + +Internal function. -@packer: -@child: -@position: +@widget: +@event: +@Returns: - + +Internal function. + + +@widget: +@event: +@Returns: + + +Internal function. -@packer: -@child: -@side: -@anchor: -@options: -@border_width: -@pad_x: -@pad_y: -@i_pad_x: -@i_pad_y: +@widget: +@event: +@Returns: - + -@packer: -@border: +@Returns: - + +Gets the value in the @spin_button. + + +@Returns: the value of @spin_button +@Deprecated: Use gtk_spin_button_get_value() instead. +@spin_button: a #GtkSpinButton + + +Creates a border around the arrows of a #GtkSpinButton. The type of border is determined by @shadow_type. -@packer: -@i_pad_x: -@i_pad_y: +@spin_button: a #GtkSpinButton +@shadow_type: the new border type. - + -@packer: -@pad_x: -@pad_y: +@status_icon: +@tooltip_text: - + -@packer: -@spacing: +@Returns: - + -Old name for gtk_paned_set_handle_size(). +Does the same as gtk_style_apply_default_background(). +@s: +@gw: +@st: +@a: +@x: +@y: +@w: +@h: +@Deprecated: Use gtk_style_apply_default_background() instead. - + -Set the the handle size to @size x @size pixels. + -@paned: a paned widget -@size: the size in pixels +@style: +@Returns: - + -@pspec: -@string_length: -@string: -@string_reversed: +@display: +@style: @Returns: - + -@pattern: -@string: -@Returns: +@style: +@widget_type: +@property_name: +@value: - + -@pspec: -@string: +@style: +@stock_id: @Returns: - + -@pspec: +@style: +@Returns: - + -@pspec: -@pattern: +@style: +@font: - + -@context: -@Returns: +@style: - + -@context: -@Returns: +@buffer: +@override_location: +@default_editable: - + -@context: -@Returns: +@first: +@second: - + -@context: -@Returns: +@iter: +@desc: - + -@op: -@n_pages: +@text_view: +@width: +@height: - + -@settings: @Returns: - + - +Creates a new #GtkTipsQuery. -@settings: -@Returns: +@Returns: a new #GtkTipsQuery. - + - +Sets the widget which initiates the query, usually a button. +If the @caller is selected while the query is running, the query is +automatically stopped. -@settings: -@num_copies: +@tips_query: a #GtkTipsQuery. +@caller: the widget which initiates the query. - + - +Sets the text to display when the query is not in effect, +and the text to display when the query is in effect but the widget beneath +the pointer has no tooltip. -@settings: -@print_to_file: +@tips_query: a #GtkTipsQuery. +@label_inactive: the text to display when the query is not running. +@label_no_tip: the text to display when the query is running but the widget +beneath the pointer has no tooltip. - + -Internal function. +Starts a query. +The #GtkTipsQuery widget will take control of the mouse and as the mouse +moves it will display the tooltip of the widget beneath the mouse. +@tips_query: a #GtkTipsQuery. - + -Internal function. Loads an image using the current -image loader. +Stops a query. -@colormap: the colormap to use for the image -@transparent_color: the transparent color for the image -@filename: the filename of the image file -@Returns: a #GtkPixmap representing @filename +@tips_query: a #GtkTipsQuery. - + -Sets the function that GTK+ will use to load images + -@loader: the #GtkImageLoader to use +@tool_item: +@Returns: - + -@ruler: the gtkruler +@tool_item: +@pack_end: - + + -@ruler: the gtkruler + - +@toolbar: +@type: +@widget: +@text: +@tooltip_text: +@tooltip_private_text: +@icon: +@callback: +@user_data: +@Returns: + + -Internal function. + -@window: -@event: +@toolbar: +@text: +@tooltip_text: +@tooltip_private_text: +@icon: +@callback: +@user_data: @Returns: - + -Internal function. + -@widget: -@event: -@Returns: +@toolbar: - + -Internal function. + +@toolbar: @widget: -@event: -@Returns: +@tooltip_text: +@tooltip_private_text: - + -Internal function. + -@widget: -@event: +@toolbar: @Returns: - + +@toolbar: @Returns: - + -Creates a border around the arrows of a #GtkSpinButton. The type of border is determined by @shadow_type. + -@spin_button: a #GtkSpinButton -@shadow_type: the new border type. +@toolbar: +@type: +@widget: +@text: +@tooltip_text: +@tooltip_private_text: +@icon: +@callback: +@user_data: +@position: +@Returns: - + +@toolbar: +@text: +@tooltip_text: +@tooltip_private_text: +@icon: +@callback: +@user_data: +@position: @Returns: - + -@display: -@style: +@toolbar: +@position: + + + + + + +@toolbar: +@stock_id: +@tooltip_text: +@tooltip_private_text: +@callback: +@user_data: +@position: @Returns: - + -@style: -@widget_type: -@property_name: -@value: +@toolbar: +@widget: +@tooltip_text: +@tooltip_private_text: +@position: - + -@buffer: -@override_location: -@default_editable: +@toolbar: +@type: +@widget: +@text: +@tooltip_text: +@tooltip_private_text: +@icon: +@callback: +@user_data: +@Returns: - + -@first: -@second: +@toolbar: +@text: +@tooltip_text: +@tooltip_private_text: +@icon: +@callback: +@user_data: +@Returns: - + -@iter: -@desc: +@toolbar: - + -@text_view: -@width: -@height: +@toolbar: +@widget: +@tooltip_text: +@tooltip_private_text: - + -@Returns: +@toolbar: +@position: - + -@tool_item: -@Returns: +@toolbar: +@orientation: - + -@tool_item: -@pack_end: +@toolbar: +@enable: @@ -3421,6 +7928,17 @@ a gtk_object_unref(). @line: line number (used within macros). @do_ref: whether to reference or unreference. + + +A alternate name for gtk_tree_model_get_iter_first() provided for +compatibility reasons; this macro will be deprecated in future +versions of GTK+. + + +@tree_model: A #GtkTreeModel. +@iter: uninitialized #GtkTreeIter. +@Returns: %TRUE, if @iter was set. + @@ -3488,6 +8006,15 @@ a gtk_object_unref(). @tree_model: @iter: + + +An alternate name for gtk_tree_path_new_first() provided for +compatibility reasons. + + +@Returns: A new #GtkTreePath. +@Deprecated: Use gtk_tree_path_new_first() instead. + @@ -3598,6 +8125,28 @@ a gtk_object_unref(). @row_draggable_func: @user_data: + + + + + +@tree_view: +@tx: +@ty: +@wx: +@wy: + + + + + + +@tree_view: +@wx: +@wy: +@tx: +@ty: + Given a GtkTypeClass pointer @klass, and a GtkType @cast_type, make @@ -3626,6 +8175,15 @@ Return the pointer to the type's children's types. @type: GtkType @Returns: pointer to a GList + + +Returns a pointer pointing to the class of @type or %NULL if there was +any trouble identifying @type. Initializes the class if necessary. + + +@type: a #GtkType. +@Returns: pointer to the class. + Print the types @type inherits from. @@ -3642,6 +8200,41 @@ show the size if @show_size is true. @type: GtkType @show_size: gboolean + + +Returns a pointer to one of @enum_type's #GtkEnumValues's whose name (or nickname) matches @value_name. + + +@enum_type: a #GtkType. +@value_name: the name to look for. +@Returns: #GtkEnumValue* + + + +If @enum_type has values, then return a pointer to all of them. + + +@enum_type: a #GtkType. +@Returns: #GtkEnumValue* + + + +Returns a pointer to one of @flag_type's #GtkFlagValue's whose name (or nickname) matches @value_name. + + +@flags_type: a #GtkType. +@value_name: the name to look for. +@Returns: #GtkFlagValue* +@flag_type: GtkType + + + +If @flags_type has values, then return a pointer to all of them. + + +@flags_type: a #GtkType. +@Returns: #GtkFlagValue* + Given the type of an object and a pointer to it, the object is freed. @@ -3650,6 +8243,14 @@ Given the type of an object and a pointer to it, the object is freed. @type: GtkType @mem: gpointer to the object + + +Gets the internal representation of a type, given its name. + + +@name: the name of a GTK+ type +@Returns: a #GtkType. + Get the varargs type associated with @foreign_type @@ -3658,6 +8259,50 @@ Get the varargs type associated with @foreign_type @foreign_type: GtkType @Returns: GtkType + + +Initializes the data structures associated with GTK+ types. + + +@debug_flags: debug flags + + + +Looks in the type hierarchy to see if @type has @is_a_type among its +ancestors. Do so with a simple lookup, not a loop. + + +@type: a #GtkType. +@is_a_type: another #GtkType. +@Returns: %TRUE if @type is a @is_a_type. + + + +Returns a pointer to the name of a type, or %NULL if it has none. + + +@type: a #GtkType. +@Returns: a pointer to the name of a type, or %NULL if it has none. + + + +Creates a new object of a given type, and return a pointer to it. +Returns %NULL if you give it an invalid type. It allocates the object +out of the type's memory chunk if there is a memory chunk. The object +has all the proper initializers called. + + +@type: a #GtkType. +@Returns: pointer to a #GtkTypeObject. + + + +Returns the parent type of a #GtkType. + + +@type: a #GtkType. +@Returns: the #GtkType of the parent. + Return the class of the parent. Initialize the class if necessary. @@ -3712,6 +8357,15 @@ Set the varargs type for a fundamental type @foreign_type. fundamental type. @varargs_type: Must be a GtkType which is either structured or flag, or NONE. + + +Creates a new, unique type. + + +@parent_type: if zero, a fundamental type is created +@gtkinfo: must not be %NULL, and @type_info->type_name must also not be %NULL +@Returns: the new #GtkType + diff --git a/docs/reference/gtk/tmpl/gtkaccelmap.sgml b/docs/reference/gtk/tmpl/gtkaccelmap.sgml index f83b75b283..c7fa69c60a 100644 --- a/docs/reference/gtk/tmpl/gtkaccelmap.sgml +++ b/docs/reference/gtk/tmpl/gtkaccelmap.sgml @@ -17,6 +17,9 @@ Loadable keyboard accelerator specifications + + + @@ -148,6 +151,7 @@ Loadable keyboard accelerator specifications +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkactiongroup.sgml b/docs/reference/gtk/tmpl/gtkactiongroup.sgml index 516210d427..2d6f4a6f77 100644 --- a/docs/reference/gtk/tmpl/gtkactiongroup.sgml +++ b/docs/reference/gtk/tmpl/gtkactiongroup.sgml @@ -70,6 +70,9 @@ it doesn't allow you to specify a signal. + + + The GtkActionGroup struct contains only private diff --git a/docs/reference/gtk/tmpl/gtkadjustment.sgml b/docs/reference/gtk/tmpl/gtkadjustment.sgml index ee85e79d61..d32aedd316 100644 --- a/docs/reference/gtk/tmpl/gtkadjustment.sgml +++ b/docs/reference/gtk/tmpl/gtkadjustment.sgml @@ -31,6 +31,9 @@ after changing the value and its bounds. This results in the emission of the + + + The #GtkAdjustment-struct struct contains the following fields. diff --git a/docs/reference/gtk/tmpl/gtkbindings.sgml b/docs/reference/gtk/tmpl/gtkbindings.sgml index fca01a21de..61961adab0 100644 --- a/docs/reference/gtk/tmpl/gtkbindings.sgml +++ b/docs/reference/gtk/tmpl/gtkbindings.sgml @@ -120,6 +120,9 @@ The "unbind" functionality has been introduced in GTK+ 2.12. + + + A binding set maintains a list of activatable key bindings. @@ -175,13 +178,6 @@ key binding signal emission as stored in #GtkBindingSignal. @arg_type: implementation detail - - - - - - - @@ -194,25 +190,6 @@ key binding signal emission as stored in #GtkBindingSignal. @binding_args: - - - - - -@binding_set: -@keyval: -@modifiers: - - - - - - - -@scanner: -@Returns: - - diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml index e5a26bb792..13ca4a6e77 100644 --- a/docs/reference/gtk/tmpl/gtkbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkbutton.sgml @@ -24,6 +24,9 @@ the #GtkLabel. + + + This should not be accessed directly. Use the accessor functions below. @@ -158,6 +161,7 @@ Creates a new #GtkButton widget. To add a child widget to the button, use gtk_container_add(). +@void: @Returns: The newly created #GtkButton widget. diff --git a/docs/reference/gtk/tmpl/gtkcalendar.sgml b/docs/reference/gtk/tmpl/gtkcalendar.sgml index 75ab42de80..c4dbd96638 100644 --- a/docs/reference/gtk/tmpl/gtkcalendar.sgml +++ b/docs/reference/gtk/tmpl/gtkcalendar.sgml @@ -36,6 +36,9 @@ gtk_calendar_get_date(). + + + num_marked_dates is an integer containing the @@ -191,6 +194,7 @@ calendar. +@void: @Returns: @@ -312,25 +316,3 @@ calendar. @rows: - - - - -@calendar: -@flags: - - - - - - -@calendar: - - - - - - -@calendar: - - diff --git a/docs/reference/gtk/tmpl/gtkcelleditable.sgml b/docs/reference/gtk/tmpl/gtkcelleditable.sgml index ebcea5faf4..b06721be98 100644 --- a/docs/reference/gtk/tmpl/gtkcelleditable.sgml +++ b/docs/reference/gtk/tmpl/gtkcelleditable.sgml @@ -18,6 +18,9 @@ to be usable when editing the contents of a #GtkTreeView cell. + + + diff --git a/docs/reference/gtk/tmpl/gtkcelllayout.sgml b/docs/reference/gtk/tmpl/gtkcelllayout.sgml index e9e8fe21be..166d2cb996 100644 --- a/docs/reference/gtk/tmpl/gtkcelllayout.sgml +++ b/docs/reference/gtk/tmpl/gtkcelllayout.sgml @@ -58,6 +58,9 @@ content of the element is the attribute value. + + + diff --git a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml index 679338bad5..4a0e088d41 100644 --- a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml @@ -51,6 +51,9 @@ respectively. + + + Tells how a cell is to be rendererd. diff --git a/docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml b/docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml index 077dcaefae..6268e44ae6 100644 --- a/docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml @@ -23,6 +23,9 @@ The #GtkCellRendererAccel cell renderer was added in GTK+ 2.10. + + + @@ -81,6 +84,7 @@ The #GtkCellRendererAccel cell renderer was added in GTK+ 2.10. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml b/docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml index 83d7900698..1a989c9d28 100644 --- a/docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml @@ -34,6 +34,9 @@ The #GtkCellRendererCombo cell renderer was added in GTK+ 2.6. + + + @@ -69,6 +72,7 @@ The #GtkCellRendererCombo cell renderer was added in GTK+ 2.6. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml b/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml index 51e23f8347..cad7a4419d 100644 --- a/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml @@ -33,6 +33,9 @@ property is set to a pixbuf, it renders that one. + + + @@ -89,6 +92,7 @@ property is set to a pixbuf, it renders that one. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml b/docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml index ccca765136..0d186f20b3 100644 --- a/docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml @@ -22,6 +22,9 @@ The #GtkCellRendererProgress cell renderer was added in GTK+ 2.6. + + + @@ -63,6 +66,7 @@ The #GtkCellRendererProgress cell renderer was added in GTK+ 2.6. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkcellrendererspin.sgml b/docs/reference/gtk/tmpl/gtkcellrendererspin.sgml index fe96170b3e..cd98ee7eca 100644 --- a/docs/reference/gtk/tmpl/gtkcellrendererspin.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrendererspin.sgml @@ -33,6 +33,9 @@ The #GtkCellRendererSpin cell renderer was added in GTK+ 2.10. + + + @@ -59,6 +62,7 @@ The #GtkCellRendererSpin cell renderer was added in GTK+ 2.10. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml b/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml index 42125e4e25..286929e823 100644 --- a/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml @@ -25,6 +25,9 @@ the #GtkCellRendererText allows to edit its text using an entry. + + + @@ -265,6 +268,7 @@ the #GtkCellRendererText allows to edit its text using an entry. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml b/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml index faacb516e2..02e266af5e 100644 --- a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml @@ -20,6 +20,9 @@ property. When activated, it emits the toggled signal. + + + @@ -64,6 +67,7 @@ property. When activated, it emits the toggled signal. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkcellview.sgml b/docs/reference/gtk/tmpl/gtkcellview.sgml index 7143a54d0b..0cc0bc1ab1 100644 --- a/docs/reference/gtk/tmpl/gtkcellview.sgml +++ b/docs/reference/gtk/tmpl/gtkcellview.sgml @@ -20,6 +20,9 @@ and drag and drop. + + + @@ -51,6 +54,7 @@ and drag and drop. +@void: @Returns: @@ -137,12 +141,3 @@ and drag and drop. @color: - - - - - -@cell_view: -@Returns: - - diff --git a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml index 25246b0525..0e6313debd 100644 --- a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml @@ -37,6 +37,9 @@ The important signal ('toggled') is also inherited from #GtkToggleButton. + + + toggle_button is a #GtkToggleButton representing the actual toggle button that composes the check button. @@ -58,6 +61,7 @@ The important signal ('toggled') is also inherited from #GtkToggleButton. Creates a new #GtkCheckButton. +@void: @Returns: a #GtkWidget. diff --git a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml index 8d83732199..51ddf14584 100644 --- a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml @@ -25,6 +25,9 @@ toggles the value. + + + The #GtkCheckMenuItem-struct struct contains the following fields. @@ -81,6 +84,7 @@ field of the #GtkCheckMenuItem-struct struct to discover the new state. Creates a new #GtkCheckMenuItem. +@void: @Returns: a new #GtkCheckMenuItem. diff --git a/docs/reference/gtk/tmpl/gtkclipboard.sgml b/docs/reference/gtk/tmpl/gtkclipboard.sgml index ddd4195c36..d39782f4e2 100644 --- a/docs/reference/gtk/tmpl/gtkclipboard.sgml +++ b/docs/reference/gtk/tmpl/gtkclipboard.sgml @@ -87,6 +87,9 @@ Storing data on clipboards + + + diff --git a/docs/reference/gtk/tmpl/gtkcolorbutton.sgml b/docs/reference/gtk/tmpl/gtkcolorbutton.sgml index 61e36900a3..f51aeca4b1 100644 --- a/docs/reference/gtk/tmpl/gtkcolorbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkcolorbutton.sgml @@ -19,6 +19,9 @@ widget for selecting a color in a preference dialog. + + + The GtkColorButton struct has only private fields and @@ -58,6 +61,7 @@ should not be used directly. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkcolorsel.sgml b/docs/reference/gtk/tmpl/gtkcolorsel.sgml index e6ed147a17..368c79140c 100644 --- a/docs/reference/gtk/tmpl/gtkcolorsel.sgml +++ b/docs/reference/gtk/tmpl/gtkcolorsel.sgml @@ -21,6 +21,9 @@ color selection dialog box #GtkColorSelectionDialog. + + + The #GtkColorSelection-struct struct contains private data only, @@ -61,6 +64,7 @@ according to its update policy. +@void: @Returns: @@ -202,15 +206,6 @@ according to its update policy. @Returns: - - - - - -@func: -@Returns: - - @@ -240,21 +235,3 @@ according to its update policy. @Since: 2.2 - - - - - -@colorsel: -@color: - - - - - - - -@colorsel: -@color: - - diff --git a/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml b/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml index f5a1fe06c0..793cacbebb 100644 --- a/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml +++ b/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml @@ -29,6 +29,9 @@ name "color_selection". It also exposes the buttons with the names + + + The #GtkColorSelectionDialog-struct struct contains the following fields. diff --git a/docs/reference/gtk/tmpl/gtkcombobox.sgml b/docs/reference/gtk/tmpl/gtkcombobox.sgml index 37ee0620cc..7e080eb21c 100644 --- a/docs/reference/gtk/tmpl/gtkcombobox.sgml +++ b/docs/reference/gtk/tmpl/gtkcombobox.sgml @@ -42,6 +42,9 @@ gtk_combo_box_get_active_text(). + + + @@ -153,6 +156,7 @@ gtk_combo_box_get_active_text(). +@void: @Returns: @@ -279,6 +283,7 @@ gtk_combo_box_get_active_text(). +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml b/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml index 04d3a63797..b8eb4892af 100644 --- a/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml +++ b/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml @@ -61,6 +61,9 @@ child with name "entry". + + + @@ -77,6 +80,7 @@ child with name "entry". +@void: @Returns: @@ -95,6 +99,7 @@ child with name "entry". +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml index c943346ad2..3218186cd4 100644 --- a/docs/reference/gtk/tmpl/gtkcontainer.sgml +++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml @@ -147,6 +147,9 @@ for regular properties. + + + @@ -159,7 +162,7 @@ for regular properties. @container: the object which received the signal. -@widget: +@widget: @@ -174,7 +177,7 @@ for regular properties. @container: the object which received the signal. -@widget: +@widget: @@ -182,7 +185,7 @@ for regular properties. @container: the object which received the signal. -@widget: +@widget: @@ -204,7 +207,7 @@ for regular properties. -@widget: +@widget: @@ -224,8 +227,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@widget: +@container: +@widget: @@ -233,8 +236,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@widget: +@container: +@widget: @@ -242,10 +245,10 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@widget: -@first_prop_name: -@Varargs: +@container: +@widget: +@first_prop_name: +@Varargs: @@ -253,8 +256,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@Returns: +@container: +@Returns: @@ -262,8 +265,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@resize_mode: +@container: +@resize_mode: @@ -271,7 +274,7 @@ properties in set_child_property() and get_child_property() implementations. -@container: +@container: @@ -279,9 +282,9 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@callback: -@callback_data: +@container: +@callback: +@callback_data: @@ -289,8 +292,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@Returns: +@container: +@Returns: @@ -298,8 +301,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@needs_redraws: +@container: +@needs_redraws: @@ -307,8 +310,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@Returns: +@container: +@Returns: @@ -316,8 +319,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@child: +@container: +@child: @@ -325,8 +328,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@Returns: +@container: +@Returns: @@ -334,8 +337,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@adjustment: +@container: +@adjustment: @@ -343,8 +346,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@Returns: +@container: +@Returns: @@ -352,8 +355,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@adjustment: +@container: +@adjustment: @@ -361,7 +364,7 @@ properties in set_child_property() and get_child_property() implementations. -@container: +@container: @@ -369,8 +372,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@Returns: +@container: +@Returns: @@ -378,10 +381,10 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@child: -@first_prop_name: -@Varargs: +@container: +@child: +@first_prop_name: +@Varargs: @@ -389,10 +392,10 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@child: -@first_prop_name: -@Varargs: +@container: +@child: +@first_prop_name: +@Varargs: @@ -400,10 +403,10 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@child: -@property_name: -@value: +@container: +@child: +@property_name: +@value: @@ -411,10 +414,10 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@child: -@property_name: -@value: +@container: +@child: +@property_name: +@value: @@ -422,10 +425,10 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@child: -@first_property_name: -@var_args: +@container: +@child: +@first_property_name: +@var_args: @@ -433,10 +436,10 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@child: -@first_property_name: -@var_args: +@container: +@child: +@first_property_name: +@var_args: @@ -444,9 +447,9 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@callback: -@callback_data: +@container: +@callback: +@callback_data: @@ -454,8 +457,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@Returns: +@container: +@Returns: @@ -463,8 +466,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@border_width: +@container: +@border_width: @@ -472,9 +475,9 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@child: -@event: +@container: +@child: +@event: @@ -482,9 +485,9 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@focusable_widgets: -@Returns: +@container: +@focusable_widgets: +@Returns: @@ -492,8 +495,8 @@ properties in set_child_property() and get_child_property() implementations. -@container: -@focusable_widgets: +@container: +@focusable_widgets: @@ -501,7 +504,7 @@ properties in set_child_property() and get_child_property() implementations. -@container: +@container: @@ -509,9 +512,9 @@ properties in set_child_property() and get_child_property() implementations. -@cclass: -@property_name: -@Returns: +@cclass: +@property_name: +@Returns: @@ -519,9 +522,9 @@ properties in set_child_property() and get_child_property() implementations. -@cclass: -@property_id: -@pspec: +@cclass: +@property_id: +@pspec: @@ -529,8 +532,8 @@ properties in set_child_property() and get_child_property() implementations. -@cclass: -@n_properties: -@Returns: +@cclass: +@n_properties: +@Returns: diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml index ecf4d83f62..32e4878e05 100644 --- a/docs/reference/gtk/tmpl/gtkdialog.sgml +++ b/docs/reference/gtk/tmpl/gtkdialog.sgml @@ -165,6 +165,9 @@ response from the user. + + + vbox is a #GtkVBox - the main part of the @@ -256,6 +259,7 @@ Creates a new dialog box. Widgets should not be packed into this #GtkWindow directly, but into the @vbox and @action_area, as described above. +@void: @Returns: a new #GtkDialog. diff --git a/docs/reference/gtk/tmpl/gtkdnd.sgml b/docs/reference/gtk/tmpl/gtkdnd.sgml index 7d127408d2..5477bff72e 100644 --- a/docs/reference/gtk/tmpl/gtkdnd.sgml +++ b/docs/reference/gtk/tmpl/gtkdnd.sgml @@ -27,6 +27,9 @@ in the #GtkWidget class. + + + The #GtkDestDefaults enumeration specifies the various @@ -321,18 +324,6 @@ a widget. @context: - - - - - -@colormap: -@pixmap: -@mask: -@hot_x: -@hot_y: - - @@ -351,11 +342,11 @@ a widget. -@widget: -@start_button_mask: -@targets: -@n_targets: -@actions: +@widget: +@start_button_mask: +@targets: +@n_targets: +@actions: diff --git a/docs/reference/gtk/tmpl/gtkdrawingarea.sgml b/docs/reference/gtk/tmpl/gtkdrawingarea.sgml index dee937a5d4..1edf19d427 100644 --- a/docs/reference/gtk/tmpl/gtkdrawingarea.sgml +++ b/docs/reference/gtk/tmpl/gtkdrawingarea.sgml @@ -107,6 +107,9 @@ refresh to the screen. + + + The #GtkDrawingArea struct contains private data only, and @@ -119,21 +122,7 @@ should be accessed using the functions below. Creates a new drawing area. +@void: @Returns: a new #GtkDrawingArea - - -Sets the size that the drawing area will request -in response to a "size_request" signal. The -drawing area may actually be allocated a size -larger than this depending on how it is packed -within the enclosing containers. - - -@darea: a #GtkDrawingArea -@width: the width to request -@height: the height to request -@Deprecated: Use gtk_widget_set_size_request() instead. - - diff --git a/docs/reference/gtk/tmpl/gtkeditable.sgml b/docs/reference/gtk/tmpl/gtkeditable.sgml index 6c503aa5cf..18c8490b1c 100644 --- a/docs/reference/gtk/tmpl/gtkeditable.sgml +++ b/docs/reference/gtk/tmpl/gtkeditable.sgml @@ -55,6 +55,9 @@ insert_text_handler (GtkEditable *editable, + + + The #GtkEditable structure is an opaque structure whose members diff --git a/docs/reference/gtk/tmpl/gtkentry.sgml b/docs/reference/gtk/tmpl/gtkentry.sgml index 692c1bf7ea..bac2315995 100644 --- a/docs/reference/gtk/tmpl/gtkentry.sgml +++ b/docs/reference/gtk/tmpl/gtkentry.sgml @@ -67,6 +67,9 @@ via the context menu of the entry. + + + The #GtkEntry-struct struct contains only private data. @@ -411,6 +414,7 @@ The #GtkEntry-struct struct contains only private data. +@void: @Returns: @@ -756,6 +760,24 @@ The #GtkEntry-struct struct contains only private data. @entry: + + + + + +@entry: +@event: +@Returns: + + + + + + + +@entry: + + Specifies the side of the entry at which an icon is placed. diff --git a/docs/reference/gtk/tmpl/gtkentrybuffer.sgml b/docs/reference/gtk/tmpl/gtkentrybuffer.sgml index 712f013153..083da46d07 100644 --- a/docs/reference/gtk/tmpl/gtkentrybuffer.sgml +++ b/docs/reference/gtk/tmpl/gtkentrybuffer.sgml @@ -17,6 +17,9 @@ GtkEntryBuffer + + + diff --git a/docs/reference/gtk/tmpl/gtkentrycompletion.sgml b/docs/reference/gtk/tmpl/gtkentrycompletion.sgml index 611b96f3cd..b0422c1311 100644 --- a/docs/reference/gtk/tmpl/gtkentrycompletion.sgml +++ b/docs/reference/gtk/tmpl/gtkentrycompletion.sgml @@ -46,6 +46,9 @@ selected, the ::action-activated signal is emitted. + + + The GtkEntryCompletion struct contains only private data. @@ -150,6 +153,7 @@ to the unmodified key via gtk_entry_get_text (GTK_ENTRY (gtk_entry_comp +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkenums.sgml b/docs/reference/gtk/tmpl/gtkenums.sgml index 181a5afaf0..579e1c0274 100644 --- a/docs/reference/gtk/tmpl/gtkenums.sgml +++ b/docs/reference/gtk/tmpl/gtkenums.sgml @@ -17,6 +17,9 @@ Public enumerated types used throughout GTK+ + + + @@ -176,18 +179,6 @@ Used for justifying the text inside a #GtkLabel widget. (See also @GTK_JUSTIFY_CENTER: The text is placed in the center of the label. @GTK_JUSTIFY_FILL: The text is placed is distributed across the label. - - - - - -@GTK_MATCH_ALL: -@GTK_MATCH_ALL_TAIL: -@GTK_MATCH_HEAD: -@GTK_MATCH_TAIL: -@GTK_MATCH_EXACT: -@GTK_MATCH_LAST: - Used to indicate which metric is used by a #GtkRuler. @@ -274,15 +265,6 @@ tabs of a #GtkNotebook, the handle of a #GtkHandleBox or the label of a @GTK_POS_TOP: The feature is at the top edge. @GTK_POS_BOTTOM: The feature is at the bottom edge. - - -An enumeration which describes whether a preview -contains grayscale or red-green-blue data. - - -@GTK_PREVIEW_COLOR: the preview contains red-green-blue data. -@GTK_PREVIEW_GRAYSCALE: The preview contains grayscale data. - Indicated the relief to be drawn around a #GtkButton. @@ -365,16 +347,6 @@ Used to change the appearance of an outline typically provided by a #GtkFrame. @GTK_SHADOW_ETCHED_IN: The outline has a sunken 3d appearance. @GTK_SHADOW_ETCHED_OUT: The outline has a raised 3d appearance - - - - - -@GTK_SIDE_TOP: -@GTK_SIDE_BOTTOM: -@GTK_SIDE_LEFT: -@GTK_SIDE_RIGHT: - This type indicates the current state of a widget; the state determines how diff --git a/docs/reference/gtk/tmpl/gtkeventbox.sgml b/docs/reference/gtk/tmpl/gtkeventbox.sgml index fdcec8f94d..66bbeea422 100644 --- a/docs/reference/gtk/tmpl/gtkeventbox.sgml +++ b/docs/reference/gtk/tmpl/gtkeventbox.sgml @@ -19,6 +19,9 @@ have their own window. + + + The #GtkEventBox-struct struct contains private data only, and @@ -41,6 +44,7 @@ should be accessed using the functions below. Creates a new #GtkEventBox. +@void: @Returns: a new #GtkEventBox. diff --git a/docs/reference/gtk/tmpl/gtkexpander.sgml b/docs/reference/gtk/tmpl/gtkexpander.sgml index 4a62060257..402ef58184 100644 --- a/docs/reference/gtk/tmpl/gtkexpander.sgml +++ b/docs/reference/gtk/tmpl/gtkexpander.sgml @@ -89,6 +89,9 @@ a <child> type attribute. + + + diff --git a/docs/reference/gtk/tmpl/gtkfeatures.sgml b/docs/reference/gtk/tmpl/gtkfeatures.sgml index d40fa257f0..16e0adddc5 100644 --- a/docs/reference/gtk/tmpl/gtkfeatures.sgml +++ b/docs/reference/gtk/tmpl/gtkfeatures.sgml @@ -19,6 +19,9 @@ typically use the features described here. + + + The major version number of the GTK+ library. (e.g. in GTK+ version diff --git a/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml b/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml index 2f13100bc9..6042343797 100644 --- a/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml @@ -51,6 +51,9 @@ such a way that other interface elements give space to the widget. + + + This should not be accessed directly. Use the accessor functions below. diff --git a/docs/reference/gtk/tmpl/gtkfilechooserdialog.sgml b/docs/reference/gtk/tmpl/gtkfilechooserdialog.sgml index 4ed335f234..cc798bcb5f 100644 --- a/docs/reference/gtk/tmpl/gtkfilechooserdialog.sgml +++ b/docs/reference/gtk/tmpl/gtkfilechooserdialog.sgml @@ -150,26 +150,16 @@ dialog = gtk_file_chooser_dialog_new ("Open File", - - - - + - + -@title: -@parent: -@action: -@first_button_text: -@Varargs: -@Returns: - - + @@ -177,17 +167,8 @@ dialog = gtk_file_chooser_dialog_new ("Open File", @title: @parent: @action: -@backend: @first_button_text: @Varargs: @Returns: - - - diff --git a/docs/reference/gtk/tmpl/gtkfilechooserwidget.sgml b/docs/reference/gtk/tmpl/gtkfilechooserwidget.sgml index 082bf46efa..434d70967d 100644 --- a/docs/reference/gtk/tmpl/gtkfilechooserwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkfilechooserwidget.sgml @@ -27,6 +27,9 @@ File chooser widget that can be embedded in other widgets + + + @@ -52,13 +55,3 @@ End: --> - - - - - -@action: -@backend: -@Returns: - - diff --git a/docs/reference/gtk/tmpl/gtkfilefilter.sgml b/docs/reference/gtk/tmpl/gtkfilefilter.sgml index 6bc5e54c7e..4f22a3cca7 100644 --- a/docs/reference/gtk/tmpl/gtkfilefilter.sgml +++ b/docs/reference/gtk/tmpl/gtkfilefilter.sgml @@ -35,6 +35,9 @@ to manually use a filter on a file with gtk_file_filter_filter(). + + + The GtkFileFilter struct contains @@ -86,6 +89,7 @@ see gtk_file_filter_add_custom(). +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkfixed.sgml b/docs/reference/gtk/tmpl/gtkfixed.sgml index db64dcbbc1..b2366aa2fd 100644 --- a/docs/reference/gtk/tmpl/gtkfixed.sgml +++ b/docs/reference/gtk/tmpl/gtkfixed.sgml @@ -67,6 +67,9 @@ widget. But you should be aware of the tradeoffs. + + + The #GtkFixed-struct struct contains the following fields. @@ -102,6 +105,7 @@ their positions. Creates a new #GtkFixed. +@void: @Returns: a new #GtkFixed. @@ -125,3 +129,5 @@ Moves a child of a #GtkFixed container to the given position. @widget: the child widget. @x: the horizontal position to move the widget to. @y: the vertical position to move the widget to. + + diff --git a/docs/reference/gtk/tmpl/gtkfontbutton.sgml b/docs/reference/gtk/tmpl/gtkfontbutton.sgml index 1eda98ee41..ca8253d7cf 100644 --- a/docs/reference/gtk/tmpl/gtkfontbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkfontbutton.sgml @@ -18,6 +18,9 @@ dialog to change the font. It is suitable widget for selecting a font in a prefe + + + The GtkFontButton struct has only private members and should not be used @@ -67,6 +70,7 @@ directly. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkfontsel.sgml b/docs/reference/gtk/tmpl/gtkfontsel.sgml index d182606e45..ce3ebf3005 100644 --- a/docs/reference/gtk/tmpl/gtkfontsel.sgml +++ b/docs/reference/gtk/tmpl/gtkfontsel.sgml @@ -38,6 +38,9 @@ gtk_font_selection_set_preview_text(). + + + The #GtkFontSelection struct contains private data only, and should @@ -65,15 +68,7 @@ only be accessed using the functions below. -@Returns: - - - - - - - -@fontsel: +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkfontseldlg.sgml b/docs/reference/gtk/tmpl/gtkfontseldlg.sgml index c8c5ad2aaf..6e98aa7992 100644 --- a/docs/reference/gtk/tmpl/gtkfontseldlg.sgml +++ b/docs/reference/gtk/tmpl/gtkfontseldlg.sgml @@ -48,6 +48,9 @@ fonts. + + + @@ -61,15 +64,6 @@ fonts. @Returns: - - - - - -@fsd: -@Returns: - - @@ -106,15 +100,6 @@ fonts. @text: - - - - - -@fsd: -@Returns: - - diff --git a/docs/reference/gtk/tmpl/gtkframe.sgml b/docs/reference/gtk/tmpl/gtkframe.sgml index 1f1d9b0204..92eab9b941 100644 --- a/docs/reference/gtk/tmpl/gtkframe.sgml +++ b/docs/reference/gtk/tmpl/gtkframe.sgml @@ -45,6 +45,9 @@ a <child> type attribute. + + + diff --git a/docs/reference/gtk/tmpl/gtkgc.sgml b/docs/reference/gtk/tmpl/gtkgc.sgml index 57d738b576..d5f5ee0aa7 100644 --- a/docs/reference/gtk/tmpl/gtkgc.sgml +++ b/docs/reference/gtk/tmpl/gtkgc.sgml @@ -21,6 +21,9 @@ When the #GdkGC is no longer needed, gtk_gc_release() should be called. + + + Gets a #GdkGC with the given depth, colormap and #GdkGCValues. diff --git a/docs/reference/gtk/tmpl/gtkhandlebox.sgml b/docs/reference/gtk/tmpl/gtkhandlebox.sgml index 8b3cae2938..dea4867a1c 100644 --- a/docs/reference/gtk/tmpl/gtkhandlebox.sgml +++ b/docs/reference/gtk/tmpl/gtkhandlebox.sgml @@ -39,6 +39,9 @@ so the snap edge should be set to %GTK_POS_BOTTOM. + + + The #GtkHandleBox-struct struct contains the following fields. @@ -137,6 +140,7 @@ handlebox are detached from the main window. Create a new handle box. +@void: @Returns: a new #GtkHandleBox. diff --git a/docs/reference/gtk/tmpl/gtkhbbox.sgml b/docs/reference/gtk/tmpl/gtkhbbox.sgml index e60693703f..1fd2dcc9f7 100644 --- a/docs/reference/gtk/tmpl/gtkhbbox.sgml +++ b/docs/reference/gtk/tmpl/gtkhbbox.sgml @@ -48,6 +48,9 @@ gtk_button_box_set_layout(). + + + GtkHButtonBox does not contain any public fields. @@ -59,4 +62,7 @@ GtkHButtonBox does not contain any public fields. Creates a new horizontal button box. +@void: @Returns: a new button box #GtkWidget. + + diff --git a/docs/reference/gtk/tmpl/gtkhpaned.sgml b/docs/reference/gtk/tmpl/gtkhpaned.sgml index df98d308fb..25fd0333b5 100644 --- a/docs/reference/gtk/tmpl/gtkhpaned.sgml +++ b/docs/reference/gtk/tmpl/gtkhpaned.sgml @@ -20,6 +20,9 @@ a handle. See #GtkPaned for details. + + + @@ -30,6 +33,7 @@ a handle. See #GtkPaned for details. Create a new #GtkHPaned +@void: @Returns: the new #GtkHPaned diff --git a/docs/reference/gtk/tmpl/gtkhruler.sgml b/docs/reference/gtk/tmpl/gtkhruler.sgml index ea2cd508fd..433dd1637c 100644 --- a/docs/reference/gtk/tmpl/gtkhruler.sgml +++ b/docs/reference/gtk/tmpl/gtkhruler.sgml @@ -33,6 +33,9 @@ rulers. + + + The #GtkHRuler struct contains private data and should be accessed @@ -45,6 +48,7 @@ with the functions below. Creates a new horizontal ruler. +@void: @Returns: a new #GtkHRuler. diff --git a/docs/reference/gtk/tmpl/gtkhscale.sgml b/docs/reference/gtk/tmpl/gtkhscale.sgml index edd4611d66..8616ef83c7 100644 --- a/docs/reference/gtk/tmpl/gtkhscale.sgml +++ b/docs/reference/gtk/tmpl/gtkhscale.sgml @@ -22,6 +22,9 @@ shown can be set using the parent #GtkScale class's functions. + + + The #GtkHScale-struct struct contains private data only, and diff --git a/docs/reference/gtk/tmpl/gtkhscrollbar.sgml b/docs/reference/gtk/tmpl/gtkhscrollbar.sgml index 574e851fa2..6412e07dba 100644 --- a/docs/reference/gtk/tmpl/gtkhscrollbar.sgml +++ b/docs/reference/gtk/tmpl/gtkhscrollbar.sgml @@ -23,6 +23,9 @@ fields in an adjustment represent for a scrollbar. + + + The #GtkHScrollbar struct contains private data and should be accessed diff --git a/docs/reference/gtk/tmpl/gtkhseparator.sgml b/docs/reference/gtk/tmpl/gtkhseparator.sgml index 9a4ebd8c0c..9e295cb858 100644 --- a/docs/reference/gtk/tmpl/gtkhseparator.sgml +++ b/docs/reference/gtk/tmpl/gtkhseparator.sgml @@ -32,6 +32,9 @@ gtk_menu_shell_append(). + + + The #GtkHSeparator-struct struct contains private data only, and @@ -44,6 +47,7 @@ should be accessed using the functions below. Creates a new #GtkHSeparator. +@void: @Returns: a new #GtkHSeparator. diff --git a/docs/reference/gtk/tmpl/gtkhsv.sgml b/docs/reference/gtk/tmpl/gtkhsv.sgml index 999a74347b..ee952c966d 100644 --- a/docs/reference/gtk/tmpl/gtkhsv.sgml +++ b/docs/reference/gtk/tmpl/gtkhsv.sgml @@ -30,6 +30,9 @@ saturation. + + + @@ -56,6 +59,7 @@ saturation. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkiconfactory.sgml b/docs/reference/gtk/tmpl/gtkiconfactory.sgml index 6c716e0a3b..614b50edbd 100644 --- a/docs/reference/gtk/tmpl/gtkiconfactory.sgml +++ b/docs/reference/gtk/tmpl/gtkiconfactory.sgml @@ -114,6 +114,9 @@ This attribute is optional. + + + @@ -204,6 +207,7 @@ This attribute is optional. +@void: @Returns: @@ -238,6 +242,7 @@ This attribute is optional. +@void: @Returns: @@ -439,6 +444,7 @@ This attribute is optional. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkicontheme.sgml b/docs/reference/gtk/tmpl/gtkicontheme.sgml index 9e2d6bb53a..922329952c 100644 --- a/docs/reference/gtk/tmpl/gtkicontheme.sgml +++ b/docs/reference/gtk/tmpl/gtkicontheme.sgml @@ -103,6 +103,9 @@ else + + + Contains information found when looking up an icon in @@ -160,6 +163,7 @@ The #GQuark used for #GtkIconThemeError errors. +@void: @Returns: @@ -168,6 +172,7 @@ The #GQuark used for #GtkIconThemeError errors. +@void: @Returns: @@ -416,6 +421,21 @@ The #GQuark used for #GtkIconThemeError errors. @Returns: + + + + + +@icon_info: +@fg: +@success_color: +@warning_color: +@error_color: +@was_symbolic: +@error: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtkiconview.sgml b/docs/reference/gtk/tmpl/gtkiconview.sgml index 1fc99d1233..2dad9dacdd 100644 --- a/docs/reference/gtk/tmpl/gtkiconview.sgml +++ b/docs/reference/gtk/tmpl/gtkiconview.sgml @@ -22,6 +22,9 @@ rubberband selection, which is controlled by dragging the pointer. + + + The GtkIconView struct contains only @@ -200,6 +203,7 @@ selected rows. It will be called on every selected row in the view. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml b/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml index b970e496b2..0ab41337aa 100644 --- a/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml @@ -21,6 +21,9 @@ fill in the text label. + + + @@ -70,6 +73,7 @@ fill in the text label. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkimcontext.sgml b/docs/reference/gtk/tmpl/gtkimcontext.sgml index ecb3ad9825..1484fdaaf3 100644 --- a/docs/reference/gtk/tmpl/gtkimcontext.sgml +++ b/docs/reference/gtk/tmpl/gtkimcontext.sgml @@ -17,6 +17,9 @@ GtkIMContext + + + diff --git a/docs/reference/gtk/tmpl/gtkimcontextsimple.sgml b/docs/reference/gtk/tmpl/gtkimcontextsimple.sgml index cdbb50b5be..59d9315c9b 100644 --- a/docs/reference/gtk/tmpl/gtkimcontextsimple.sgml +++ b/docs/reference/gtk/tmpl/gtkimcontextsimple.sgml @@ -17,6 +17,9 @@ An input method context supporting table-based input methods + + + @@ -28,6 +31,7 @@ An input method context supporting table-based input methods +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkimmulticontext.sgml b/docs/reference/gtk/tmpl/gtkimmulticontext.sgml index d216507e62..f75374535f 100644 --- a/docs/reference/gtk/tmpl/gtkimmulticontext.sgml +++ b/docs/reference/gtk/tmpl/gtkimmulticontext.sgml @@ -17,6 +17,9 @@ An input method context supporting multiple, loadable input methods + + + @@ -28,6 +31,7 @@ An input method context supporting multiple, loadable input methods +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkinvisible.sgml b/docs/reference/gtk/tmpl/gtkinvisible.sgml index 9315fe8d97..0f4ead0372 100644 --- a/docs/reference/gtk/tmpl/gtkinvisible.sgml +++ b/docs/reference/gtk/tmpl/gtkinvisible.sgml @@ -22,6 +22,9 @@ for drag-and-drop. + + + The #GtkInvisible-struct struct contains no public fields. @@ -37,6 +40,7 @@ The #GtkInvisible-struct struct contains no public fields. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkitem.sgml b/docs/reference/gtk/tmpl/gtkitem.sgml index effa9a3c6e..626cf5a987 100644 --- a/docs/reference/gtk/tmpl/gtkitem.sgml +++ b/docs/reference/gtk/tmpl/gtkitem.sgml @@ -18,6 +18,9 @@ and #GtkTreeItem. + + + The #GtkItem-struct struct contains private data only, and diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml index b3021bd5b6..0740e5f4af 100644 --- a/docs/reference/gtk/tmpl/gtklabel.sgml +++ b/docs/reference/gtk/tmpl/gtklabel.sgml @@ -200,6 +200,9 @@ the #GtkLabel::activate-link signal and the gtk_label_get_current_uri() function + + + This should not be accessed directly. Use the accessor functions as @@ -436,18 +439,6 @@ The pattern of underlines you want under the existing text within the @n_chars: - - -Gets the current string of text within the #GtkLabel and writes it to -the given @str argument. It does not make a copy of this string so you -must not write to it. - - -@label: The #GtkLabel widget you want to get the text from. -@str: The reference to the pointer you want to point to the text. -@Deprecated: Use gtk_label_get_text() instead. - - @@ -466,14 +457,6 @@ must not write to it. @wrap_mode: - - -Sets the text within the GtkLabel widget. - - -@Deprecated: Use gtk_label_set_text() instead. - - diff --git a/docs/reference/gtk/tmpl/gtklayout.sgml b/docs/reference/gtk/tmpl/gtklayout.sgml index d3845bbc70..1b32027d0c 100644 --- a/docs/reference/gtk/tmpl/gtklayout.sgml +++ b/docs/reference/gtk/tmpl/gtklayout.sgml @@ -30,6 +30,9 @@ area. + + + @@ -127,22 +130,6 @@ area. @height: - - - - - -@layout: - - - - - - - -@layout: - - diff --git a/docs/reference/gtk/tmpl/gtklinkbutton.sgml b/docs/reference/gtk/tmpl/gtklinkbutton.sgml index f7ed37881d..084efabff7 100644 --- a/docs/reference/gtk/tmpl/gtklinkbutton.sgml +++ b/docs/reference/gtk/tmpl/gtklinkbutton.sgml @@ -39,6 +39,9 @@ on it: see gtk_link_button_set_uri_hook(). + + + The #GtkLinkButton struct contains private data only, and should be diff --git a/docs/reference/gtk/tmpl/gtkliststore.sgml b/docs/reference/gtk/tmpl/gtkliststore.sgml index 3577740d47..24f3a1c8b5 100644 --- a/docs/reference/gtk/tmpl/gtkliststore.sgml +++ b/docs/reference/gtk/tmpl/gtkliststore.sgml @@ -166,6 +166,9 @@ and common wisdom is to separate the two, as far as possible. + + + diff --git a/docs/reference/gtk/tmpl/gtkmain.sgml b/docs/reference/gtk/tmpl/gtkmain.sgml index b7af513ac7..a45cde4f21 100644 --- a/docs/reference/gtk/tmpl/gtkmain.sgml +++ b/docs/reference/gtk/tmpl/gtkmain.sgml @@ -84,11 +84,15 @@ functions such as g_signal_connect(). + + + +@void: @Returns: @@ -97,6 +101,7 @@ functions such as g_signal_connect(). +@void: @@ -104,6 +109,7 @@ functions such as g_signal_connect(). +@void: @Returns: @@ -180,6 +186,7 @@ and invoke timeouts etc. while doing some time intensive computation. +@void: @Returns: %TRUE if any events are pending, %FALSE otherwise. @@ -190,6 +197,7 @@ gtk_main(). In that case gtk_main_quit() will make the innermost invocation of the main loop return. +@void: @@ -198,6 +206,7 @@ Asks for the current nesting level of the main loop. This can be useful when calling gtk_quit_add(). +@void: @Returns: the nesting level of the current invocation of the main loop. @@ -207,6 +216,7 @@ Makes the innermost invocation of the main loop return when it regains control. +@void: @@ -217,6 +227,7 @@ want to block look at gtk_main_iteration_do() or check if any events are pending with gtk_events_pending() first. +@void: @Returns: %TRUE if gtk_main_quit() has been called for the innermost mainloop. @@ -351,6 +362,7 @@ main (int argc, char **argv) +@void: @Returns: %TRUE @@ -360,6 +372,7 @@ Analogical to gtk_true() this function does nothing but always returns %FALSE. +@void: @Returns: %FALSE @@ -382,6 +395,7 @@ widget and this function does nothing. Queries the current grab of the default window group. +@void: @Returns: The widget which currently has the grab or %NULL if no grab is active. @@ -481,6 +495,7 @@ GTK+ to compute the sizes of widgets. This priority is higher than + Installs a key snooper function, which will get called on all key events @@ -517,6 +532,7 @@ Removes the key snooper function with the given id. +@void: @Returns: @@ -525,6 +541,7 @@ Removes the key snooper function with the given id. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml index fc4b42e9a9..d0497ae568 100644 --- a/docs/reference/gtk/tmpl/gtkmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkmenu.sgml @@ -79,6 +79,9 @@ my_popup_handler (GtkWidget *widget, GdkEvent *event) + + + The #GtkMenu struct contains private data only, and @@ -194,6 +197,7 @@ should be accessed using the functions below. Creates a new #GtkMenu. +@void: @Returns: a new #GtkMenu. diff --git a/docs/reference/gtk/tmpl/gtkmenubar.sgml b/docs/reference/gtk/tmpl/gtkmenubar.sgml index 9a6b11cd53..89504630b8 100644 --- a/docs/reference/gtk/tmpl/gtkmenubar.sgml +++ b/docs/reference/gtk/tmpl/gtkmenubar.sgml @@ -17,6 +17,9 @@ The #GtkMenuBar is a subclass of #GtkMenuShell which contains one to many #GtkMe + + + The #GtkMenuBar struct contains the following fields. (These fields should be considered read-only. They should never be set by an application.) @@ -48,40 +51,10 @@ The #GtkMenuBar struct contains the following fields. (These fields should be co Creates the new #GtkMenuBar +@void: @Returns: the #GtkMenuBar - - -Adds a new #GtkMenuItem to the end of the GtkMenuBar - - -@menu: a #GtkMenuBar -@child: the #GtkMenuItem to add -@Deprecated: Use gtk_menu_shell_append() instead. - - - - -Adds a new #GtkMenuItem to the beginning of the GtkMenuBar - - -@menu: a #GtkMenuBar -@child: the #GtkMenuItem to add -@Deprecated: Use gtk_menu_shell_prepend() instead. - - - - -Adds a new #GtkMenuItem to the GtkMenuBar at the position defined by @position - - -@menu: a #GtkMenuBar -@child: the #GtkMenuItem to add -@pos: the position in the item list where the @child is added. -@Deprecated: Use gtk_menu_shell_insert() instead. - - Determines how widgets should be packed insided menubars and diff --git a/docs/reference/gtk/tmpl/gtkmenuitem.sgml b/docs/reference/gtk/tmpl/gtkmenuitem.sgml index 011430d38c..6f293ab2ab 100644 --- a/docs/reference/gtk/tmpl/gtkmenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkmenuitem.sgml @@ -54,6 +54,9 @@ attribute of a <child> element. + + + @@ -151,6 +154,7 @@ submenu. For normal applications, the relevant signal is "activate". Creates a new #GtkMenuItem. +@void: @Returns: the newly created #GtkMenuItem @@ -244,14 +248,6 @@ Creates a new #GtkMenuItem whose child is a #GtkLabel. @Returns: - - - - - -@menu_item: - - @@ -314,11 +310,3 @@ Emits the "toggle_size_allocate" signal on the given item. @allocation: the allocation to use as signal data. - - -Sets the menu item to be right-justified. Only useful for menu bars. - - -@menu_item: the menu item - - diff --git a/docs/reference/gtk/tmpl/gtkmenushell.sgml b/docs/reference/gtk/tmpl/gtkmenushell.sgml index 90dece5e27..2153098b23 100644 --- a/docs/reference/gtk/tmpl/gtkmenushell.sgml +++ b/docs/reference/gtk/tmpl/gtkmenushell.sgml @@ -25,6 +25,9 @@ allowing for nested hierarchical menus. + + + The #GtkMenuShell-struct struct contains the following fields. diff --git a/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml b/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml index f55163fe01..c56eab0d76 100644 --- a/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml @@ -39,6 +39,9 @@ A GtkToolItem containing a button with an additional dropdown menu + + + The #GtkMenuToolButton struct contains only private data and @@ -95,17 +98,6 @@ A GtkToolItem containing a button with an additional dropdown menu @Returns: - - - - - -@button: -@tooltips: -@tip_text: -@tip_private: - - diff --git a/docs/reference/gtk/tmpl/gtkmisc.sgml b/docs/reference/gtk/tmpl/gtkmisc.sgml index e930403247..c3466bb6fd 100644 --- a/docs/reference/gtk/tmpl/gtkmisc.sgml +++ b/docs/reference/gtk/tmpl/gtkmisc.sgml @@ -28,6 +28,9 @@ allocated area, the alignment settings will not alter the widgets position. + + + The #GtkMisc-struct struct contains the following fields. diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml index b4a4827a04..154a6424cf 100644 --- a/docs/reference/gtk/tmpl/gtknotebook.sgml +++ b/docs/reference/gtk/tmpl/gtknotebook.sgml @@ -66,6 +66,9 @@ element. + + + @@ -174,16 +177,6 @@ Emitted when the user or a function changes the current page. - - - - - - - - - - @@ -204,26 +197,11 @@ Emitted when the user or a function changes the current page. - - - - - - - - - - - - - - - @@ -310,6 +288,7 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook. +@void: @Returns: @@ -386,14 +365,6 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook. @page_num: - - -Deprecated compatibility macro. - - -@Deprecated: Use gtk_notebook_get_current_page() instead. - - @@ -403,14 +374,6 @@ Deprecated compatibility macro. @Returns: - - -Deprecated compatibility macro. - - -@Deprecated: Use gtk_notebook_set_current_page() instead. - - @@ -466,14 +429,6 @@ Deprecated compatibility macro. @scrollable: - - - - -@notebook: -@border_width: - - @@ -543,14 +498,6 @@ Deprecated compatibility macro. @pack_type: - - - - -@notebook: -@homogeneous: - - @@ -569,14 +516,6 @@ Deprecated compatibility macro. @menu_text: - - - - -@notebook: -@tab_hborder: - - @@ -606,14 +545,6 @@ Deprecated compatibility macro. @tab_text: - - - - -@notebook: -@tab_vborder: - - @@ -719,24 +650,6 @@ Deprecated compatibility macro. @page_num: - - - - - -@notebook: -@group_id: - - - - - - - -@notebook: -@Returns: - - diff --git a/docs/reference/gtk/tmpl/gtkobject.sgml b/docs/reference/gtk/tmpl/gtkobject.sgml index d4ab2e7c46..cb39a8cbf6 100644 --- a/docs/reference/gtk/tmpl/gtkobject.sgml +++ b/docs/reference/gtk/tmpl/gtkobject.sgml @@ -90,6 +90,9 @@ explicitly call g_object_ref() yourself. + + + The object itself. You should never use these members directly - @@ -106,11 +109,6 @@ if all references are released. @object: the object which received the signal. - - - - - @@ -132,7 +130,6 @@ Tells about the state of the object. @GTK_IN_DESTRUCTION: the object is currently being destroyed. This is used internally by GTK+ to prevent reinvokations during destruction. -@GTK_FLOATING: @GTK_RESERVED_1: @GTK_RESERVED_2: reserved for future use @@ -145,104 +142,6 @@ accessing its members. @obj: the object whose flags are returned. - - -Evaluates to %TRUE if the object still has its floating reference count. -See the overview documentation for #GtkObject. - - -@obj: the object to examine. - - - - -Possible flags indicating how an argument should be treated. - - -@GTK_ARG_READABLE: the argument is readable. (i.e. can be queried) -@GTK_ARG_WRITABLE: the argument is writable. (i.e. settable) -@GTK_ARG_CONSTRUCT: the argument needs construction. -@GTK_ARG_CONSTRUCT_ONLY: the argument needs construction (and will -be set once during object creation), but is otherwise cannot be -set. Hence this flag is not allowed with #GTK_ARG_WRITABLE, -and is redundant with #GTK_ARG_CONSTRUCT. -@GTK_ARG_CHILD_ARG: an argument type that applies to (and may be different for) -each child. Used by #GtkContainer. -@Deprecated: Use corresponding #GParamSpec features instead - - - -Constructs an object given its arguments, enumerated in the call to the -function. - - -@type: the type identifying this object. Returned by gtk_type_unique() -(although for a properly-written object it should be accessible through -a #GTK_TYPE_FOO macro.) -@first_property_name: name of the first property to set when constructing - the object. -@Varargs: the first argument's value, followed by any number of -name/argument-value pairs, terminated with %NULL. -@Returns: the new #GtkObject. -@Deprecated: Use g_object_new() instead. - - - - -Removes the floating reference from a #GtkObject, if it exists; -otherwise does nothing. See the #GtkObject overview documentation at -the top of the page. - - -@object: the object to sink. -@Deprecated: 2.10: Use g_object_ref_sink() instead - - - - -Increases the reference count of the object. - - -@object: the object to reference. -@Returns: @object. -@Deprecated: Use g_object_ref() instead. - - - - -Decreases the reference count of an object. When its reference count drops -to 0, the object is finalized (i.e. its memory is freed). - - -@object: the object to dereference. -@Deprecated: Use g_object_unref() instead. - - - - -Adds a weak reference callback to an object. Weak references are used for notification when an object is -finalized. They are called "weak references" because they allow you to safely -hold a pointer to an object without calling g_object_ref() (g_object_ref() adds -a strong reference, that is, forces the object to stay alive). - - -@object: object to weakly reference. -@notify: callback to invoke before the object is freed. -@data: extra data to pass to #notify. -@Deprecated: Use g_object_weak_ref() instead. - - - - -Removes a weak reference callback to an object. - - -@object: object stop weakly referencing. -@notify: callback to search for. -@data: data to search for. -@Deprecated: Use g_object_weak_unref() instead. - - Emits the "destroy" signal notifying all reference holders that they should @@ -258,247 +157,3 @@ reference holders to release their references, it does not free the object. @object: the object to destroy. - - -Gets properties of an object. - - -@object: a #GtkObject. -@first_property_name: name of first property to get the value for. -@Varargs: %NULL-terminated list of name-return location pairs. -@Deprecated: Use g_object_get() instead. - - - - -Sets properties on an object. - - - - -void set_box_properties (GtkBox* box) -{ - gtk_object_set (GTK_OBJECT (box), "homogeneous", TRUE, - "spacing", 8, - NULL); -} - - - - -@object: a #GtkObject. -@first_property_name: name of the first property to set -@Varargs: the value of the first argument, followed optionally -by more name/value pairs, followed by %NULL. -@Deprecated: Use g_object_set() instead. - - - - -Each object carries around a table of associations from -strings to pointers. This function lets you set an association. - - -If the object already had an association with that name, -the old association will be destroyed. - - -@object: object containing the associations. -@key: name of the key. -@data: data to associate with that key. -@Deprecated: Use g_object_set_data() instead. - - - - -Like gtk_object_set_data() except it adds notification -for when the association is destroyed, either by -gtk_object_remove_data() or when the object is destroyed. - - -@object: object containing the associations. -@key: name of the key. -@data: data to associate with that key. -@destroy: function to call when the association is destroyed. -@Deprecated: Use g_object_set_data_full() instead. - - - - -Removes a specified datum from the object's data associations (the object_data). -Subsequent calls to gtk_object_get_data() will return %NULL. - - -If you specified a destroy handler with gtk_object_set_data_full(), -it will be invoked. - - -@object: the object maintaining the association. -@key: name of the key for that association. -@Deprecated: Use g_object_set_data() to set the object data to %NULL instead. - - - - -Get a named field from the object's table of associations (the object_data). - - -@object: the object maintaining the associations. -@key: name of the key for that association. -@Returns: the data if found, or %NULL if no such data exists. -@Deprecated: Use g_object_get_data() instead. - - - - -Remove a specified datum from the object's data associations (the object_data), -without invoking the association's destroy handler. - - -Just like gtk_object_remove_data() except that any destroy handler -will be ignored. -Therefore this only affects data set using gtk_object_set_data_full(). - - -@object: the object maintaining the association. -@key: name of the key for that association. -@Deprecated: Use g_object_steal_data() instead. - - - - -For convenience, every object offers a generic user data -pointer. This function sets it. - - -@object: the object whose user data should be set. -@data: the new value for the user data. -@Deprecated: Use g_object_set_data() instead. - - - - -Get the object's user data pointer. - - -This is intended to be a pointer for your convenience in -writing applications. - - -@object: the object. -@Returns: the user data field for object. -@Deprecated: Use g_object_get_data() instead. - - - - -Deprecated in favor of the #GObject property system including #GParamSpec. -Add a new type of argument to an object class. -Usually this is called when registering a new type of object. - - -@arg_name: fully qualify object name, for example GtkObject::user_data. -@arg_type: type of the argument. -@arg_flags: bitwise-OR of the #GtkArgFlags enum. (Whether the argument is -settable or gettable, whether it is set when the object is constructed.) -@arg_id: an internal number, passed in from here to the "set_arg" and -"get_arg" handlers of the object. - - - - -Just like gtk_object_set_data() except that it takes -a #GQuark instead of a string, so it is slightly faster. - - -Use gtk_object_data_try_key() and gtk_object_data_force_id() -to get an id from a string. - - -@object: object containing the associations. -@data_id: quark of the key. -@data: data to associate with that key. -@Deprecated: Use g_object_set_qdata() instead. - - - - -Just like gtk_object_set_data_full() except that it takes -a #GQuark instead of a string, so it is slightly faster. - - -Use gtk_object_data_try_key() and gtk_object_data_force_id() -to get an id from a string. - - -@object: object containing the associations. -@data_id: quark of the key. -@data: data to associate with that key. -@destroy: function to call when the association is destroyed. -@Deprecated: Use g_object_set_qdata_full() instead. - - - - -Just like gtk_object_get_data() except that it takes -a #GQuark instead of a string, so it is slightly faster. - - -Use gtk_object_data_try_key() and gtk_object_data_force_id() -to get an id from a string. - - -@object: object containing the associations. -@data_id: quark of the key. -@Returns: the data if found, or %NULL if no such data exists. -@Deprecated: Use g_object_get_qdata() instead. - - - - -Just like gtk_object_remove_data() except that it takes -a #GQuark instead of a string, so it is slightly faster. - - -Remove a specified datum from the object's data associations. -Subsequent calls to gtk_object_get_data() will return %NULL. - - -Use gtk_object_data_try_key() and gtk_object_data_force_id() -to get an id from a string. - - -@object: object containing the associations. -@data_id: quark of the key. -@Deprecated: Use g_object_set_qdata() with data of %NULL instead. - - - - -Just like gtk_object_remove_no_notify() except that it takes -a #GQuark instead of a string, so it is slightly faster. - - -Use gtk_object_data_try_key() and gtk_object_data_force_id() -to get an id from a string. - - -@object: object containing the associations. -@key_id: quark of the key. -@Deprecated: Use g_object_steal_qdata() instead. - - - - -Useless deprecated macro. Ignore it. - - - - - - -Useless deprecated macro. Ignore it. - - - - diff --git a/docs/reference/gtk/tmpl/gtkorientable.sgml b/docs/reference/gtk/tmpl/gtkorientable.sgml index 1debb51b7b..4f1a153f5d 100644 --- a/docs/reference/gtk/tmpl/gtkorientable.sgml +++ b/docs/reference/gtk/tmpl/gtkorientable.sgml @@ -25,6 +25,9 @@ GtkOrientable was introduced in GTK+ 2.16. + + + diff --git a/docs/reference/gtk/tmpl/gtkpagesetup.sgml b/docs/reference/gtk/tmpl/gtkpagesetup.sgml index 7739b35866..cac99e1421 100644 --- a/docs/reference/gtk/tmpl/gtkpagesetup.sgml +++ b/docs/reference/gtk/tmpl/gtkpagesetup.sgml @@ -61,6 +61,9 @@ Printing support was added in GTK+ 2.10. + + + @@ -72,6 +75,7 @@ Printing support was added in GTK+ 2.10. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkpagesetupunixdialog.sgml b/docs/reference/gtk/tmpl/gtkpagesetupunixdialog.sgml index e61fefca08..8001b7ec2a 100644 --- a/docs/reference/gtk/tmpl/gtkpagesetupunixdialog.sgml +++ b/docs/reference/gtk/tmpl/gtkpagesetupunixdialog.sgml @@ -25,6 +25,9 @@ Printing support was added in GTK+ 2.10. + + + diff --git a/docs/reference/gtk/tmpl/gtkpaned.sgml b/docs/reference/gtk/tmpl/gtkpaned.sgml index 8ccef04e04..afeecfe5b1 100644 --- a/docs/reference/gtk/tmpl/gtkpaned.sgml +++ b/docs/reference/gtk/tmpl/gtkpaned.sgml @@ -72,6 +72,9 @@ gtk_widget_set_size_request (frame2, 50, -1); + + + @@ -249,3 +252,12 @@ Adds a child to the bottom or right pane. @Returns: + + + + + +@paned: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtkpapersize.sgml b/docs/reference/gtk/tmpl/gtkpapersize.sgml index 7dea34e400..abc19fd132 100644 --- a/docs/reference/gtk/tmpl/gtkpapersize.sgml +++ b/docs/reference/gtk/tmpl/gtkpapersize.sgml @@ -31,6 +31,9 @@ Printing support has been added in GTK+ 2.10. + + + @@ -278,6 +281,7 @@ Name for the Legal paper size. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkprintcontext.sgml b/docs/reference/gtk/tmpl/gtkprintcontext.sgml index 2c4549508e..651cbce8c7 100644 --- a/docs/reference/gtk/tmpl/gtkprintcontext.sgml +++ b/docs/reference/gtk/tmpl/gtkprintcontext.sgml @@ -86,6 +86,9 @@ Printing support was added in GTK+ 2.10. + + + diff --git a/docs/reference/gtk/tmpl/gtkprinter.sgml b/docs/reference/gtk/tmpl/gtkprinter.sgml index d15d3ca506..3a3f6791ad 100644 --- a/docs/reference/gtk/tmpl/gtkprinter.sgml +++ b/docs/reference/gtk/tmpl/gtkprinter.sgml @@ -29,6 +29,9 @@ Printing support was added in GTK+ 2.10. + + + diff --git a/docs/reference/gtk/tmpl/gtkprintjob.sgml b/docs/reference/gtk/tmpl/gtkprintjob.sgml index 11d3ff9982..09d2681327 100644 --- a/docs/reference/gtk/tmpl/gtkprintjob.sgml +++ b/docs/reference/gtk/tmpl/gtkprintjob.sgml @@ -32,6 +32,9 @@ Printing support was added in GTK+ 2.10. + + + The GtkPrintJob struct contains only private members diff --git a/docs/reference/gtk/tmpl/gtkprintoperation.sgml b/docs/reference/gtk/tmpl/gtkprintoperation.sgml index 9228734d48..00cc328b35 100644 --- a/docs/reference/gtk/tmpl/gtkprintoperation.sgml +++ b/docs/reference/gtk/tmpl/gtkprintoperation.sgml @@ -86,6 +86,9 @@ Printing support was added in GTK+ 2.10. + + + @@ -349,6 +352,7 @@ The #GQuark used for #GtkPrintError errors. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkprintsettings.sgml b/docs/reference/gtk/tmpl/gtkprintsettings.sgml index 13d545f460..4a1ee3bf16 100644 --- a/docs/reference/gtk/tmpl/gtkprintsettings.sgml +++ b/docs/reference/gtk/tmpl/gtkprintsettings.sgml @@ -33,6 +33,9 @@ Printing support was added in GTK+ 2.10. + + + @@ -54,6 +57,7 @@ Printing support was added in GTK+ 2.10. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkprintunixdialog.sgml b/docs/reference/gtk/tmpl/gtkprintunixdialog.sgml index 4a732b3bec..d5155ad70b 100644 --- a/docs/reference/gtk/tmpl/gtkprintunixdialog.sgml +++ b/docs/reference/gtk/tmpl/gtkprintunixdialog.sgml @@ -79,6 +79,9 @@ The GtkPrintUnixDialog implementation of the GtkBuildable interface exposes its + + + diff --git a/docs/reference/gtk/tmpl/gtkprogress.sgml b/docs/reference/gtk/tmpl/gtkprogress.sgml index a83d5b1280..3b63a76c83 100644 --- a/docs/reference/gtk/tmpl/gtkprogress.sgml +++ b/docs/reference/gtk/tmpl/gtkprogress.sgml @@ -19,6 +19,9 @@ the progress of a long running operation. + + + The #GtkProgress-struct struct contains private data only. diff --git a/docs/reference/gtk/tmpl/gtkprogressbar.sgml b/docs/reference/gtk/tmpl/gtkprogressbar.sgml index 6d6d64a1a9..3d4b816134 100644 --- a/docs/reference/gtk/tmpl/gtkprogressbar.sgml +++ b/docs/reference/gtk/tmpl/gtkprogressbar.sgml @@ -59,6 +59,9 @@ a large chunk of deprecated 1.2 compatibility functions. + + + The #GtkProgressBar-struct struct contains private data only, @@ -66,31 +69,6 @@ and should be accessed using the functions below. - - - - - - - - - - - - - - - - - - - - - - - - - @@ -151,6 +129,7 @@ and should be accessed using the functions below. Creates a new #GtkProgressBar. +@void: @Returns: a #GtkProgressBar. @@ -263,23 +242,6 @@ directions for the visible progress bar. @Returns: - - - -@adjustment: -@Returns: - - - - -Sets the style of the #GtkProgressBar. The default style is -%GTK_PROGRESS_CONTINUOUS. - - -@pbar: a #GtkProgressBar. -@style: a #GtkProgressBarStyle value indicating the desired style. - - An enumeration representing the styles for drawing the progress bar. @@ -288,45 +250,3 @@ An enumeration representing the styles for drawing the progress bar. @GTK_PROGRESS_CONTINUOUS: The progress bar grows in a smooth, continuous manner. @GTK_PROGRESS_DISCRETE: The progress bar grows in discrete, visible blocks. - - -Sets the number of blocks that the progress bar is divided into -when the style is %GTK_PROGRESS_DISCRETE. - - -@pbar: a #GtkProgressBar. -@blocks: number of individual blocks making up the bar. - - - - -Sets the step value used when the progress bar is in activity -mode. The step is the amount by which the progress is incremented -each iteration. - - -@pbar: a #GtkProgressBar. -@step: the amount which the progress is incremented in activity -mode. - - - - -Sets the number of blocks used when the progress bar is in activity -mode. Larger numbers make the visible block smaller. - - -@pbar: a #GtkProgressBar. -@blocks: number of blocks which can fit within the progress bar area. - - - - -This function is deprecated. Please use gtk_progress_set_value() or -gtk_progress_set_percentage() instead. - - -@pbar: a #GtkProgressBar. -@percentage: the new percent complete value. - - diff --git a/docs/reference/gtk/tmpl/gtkradioaction.sgml b/docs/reference/gtk/tmpl/gtkradioaction.sgml index 55992c45ae..c3ccf4e7bd 100644 --- a/docs/reference/gtk/tmpl/gtkradioaction.sgml +++ b/docs/reference/gtk/tmpl/gtkradioaction.sgml @@ -19,6 +19,9 @@ one time. + + + The GtkRadioAction struct contains diff --git a/docs/reference/gtk/tmpl/gtkradiobutton.sgml b/docs/reference/gtk/tmpl/gtkradiobutton.sgml index 16e187bb96..7899959773 100644 --- a/docs/reference/gtk/tmpl/gtkradiobutton.sgml +++ b/docs/reference/gtk/tmpl/gtkradiobutton.sgml @@ -93,6 +93,9 @@ many. + + + Contains only private data that should be read and manipulated using the diff --git a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml index 897c5f64d1..3b739c667f 100644 --- a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml @@ -51,6 +51,9 @@ for (i = 0; i < 5; i++) + + + The structure contains only private data that must be accessed through @@ -126,13 +129,6 @@ Creates a new #GtkRadioMenuItem. @Returns: - - -Deprecated compatibility macro. Use gtk_radio_menu_item_get_group() instead. - - - - Sets the group of a radio menu item, or changes it. diff --git a/docs/reference/gtk/tmpl/gtkradiotoolbutton.sgml b/docs/reference/gtk/tmpl/gtkradiotoolbutton.sgml index 0f6f8b3f07..61876786e7 100644 --- a/docs/reference/gtk/tmpl/gtkradiotoolbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkradiotoolbutton.sgml @@ -58,6 +58,9 @@ gtk_radio_tool_button_new_from_widget_with_stock() to create a new + + + The #GtkRadioToolButton contains only private data and should only diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml index faa8310ee7..d64ef0851c 100644 --- a/docs/reference/gtk/tmpl/gtkrange.sgml +++ b/docs/reference/gtk/tmpl/gtkrange.sgml @@ -24,6 +24,9 @@ of the "steppers". It also provides properties and methods for setting a + + + diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml index 3fd1be5417..305bc63e36 100644 --- a/docs/reference/gtk/tmpl/gtkrc.sgml +++ b/docs/reference/gtk/tmpl/gtkrc.sgml @@ -16,14 +16,13 @@ at runtime. An application can cause GTK+ to parse a specific RC file by calling gtk_rc_parse(). In addition to this, certain files will be read at the end of gtk_init(). -Unless modified, the files looked for will be -<SYSCONFDIR>/gtk-2.0/gtkrc -and .gtkrc-2.0 in the users home directory. -(<SYSCONFDIR> defaults to +Unless modified, the files looked for will be +<SYSCONFDIR>/gtk-2.0/gtkrc +and .gtkrc-3.0 in the users home directory. +(<SYSCONFDIR> defaults to /usr/local/etc. It can be changed with the - or options when -configuring GTK+.) Note that although the filenames contain the version -number 2.0, all 2.x versions of GTK+ look for these files. + or options when +configuring GTK+.) The set of these default files @@ -35,11 +34,11 @@ can be set to a #G_SEARCHPATH_SEPARATOR_S-separated list of files in order to overwrite the set of default files at runtime. -For each RC file, in addition to the file itself, GTK+ will look for -a locale-specific file that will be parsed after the main file. +For each RC file, in addition to the file itself, GTK+ will look for +a locale-specific file that will be parsed after the main file. For instance, if LANG is set to ja_JP.ujis, -when loading the default file ~/.gtkrc then GTK+ looks -for ~/.gtkrc.ja_JP and ~/.gtkrc.ja, +when loading the default file ~/.gtkrc then GTK+ looks +for ~/.gtkrc.ja_JP and ~/.gtkrc.ja, and parses the first of those that exists. @@ -57,29 +56,29 @@ of such a statement: widget "mywindow.*.GtkEntry" style "my-entry-class" -attaches the style "my-entry-class" to all -widgets whose widget path matches the -pattern "mywindow.*.GtkEntry". -That is, all #GtkEntry widgets which are part of a #GtkWindow named +attaches the style "my-entry-class" to all +widgets whose widget path matches the +pattern "mywindow.*.GtkEntry". +That is, all #GtkEntry widgets which are part of a #GtkWindow named "mywindow". -The patterns here are given in the standard shell glob syntax. -The "?" wildcard matches any character, while -"*" matches zero or more of any character. +The patterns here are given in the standard shell glob syntax. +The "?" wildcard matches any character, while +"*" matches zero or more of any character. The three types of matching are against the widget path, the -class path and the class hierarchy. Both the -widget path and the class path consist of a "." -separated list of all the parents of the widget and the widget itself -from outermost to innermost. The difference is that in the widget path, -the name assigned by gtk_widget_set_name() is used if present, otherwise -the class name of the widget, while for the class path, the class name is +class path and the class hierarchy. Both the +widget path and the class path consist of a "." +separated list of all the parents of the widget and the widget itself +from outermost to innermost. The difference is that in the widget path, +the name assigned by gtk_widget_set_name() is used if present, otherwise +the class name of the widget, while for the class path, the class name is always used. Since GTK+ 2.10,widget_class paths can also contain -<classname> substrings, which are matching +<classname> substrings, which are matching the class with the given name and any derived classes. For instance, widget_class "*<GtkMenuItem>.GtkLabel" style "my-style" @@ -87,14 +86,14 @@ widget_class "*<GtkMenuItem>.GtkLabel" style "my-style" will match #GtkLabel widgets which are contained in any kind of menu item. -So, if you have a #GtkEntry named "myentry", inside of a +So, if you have a #GtkEntry named "myentry", inside of a horizontal box in a window named "mywindow", then the widget path is: "mywindow.GtkHBox.myentry" while the class path is: "GtkWindow.GtkHBox.GtkEntry". Matching against class is a little different. The pattern match is done -against all class names in the widgets class hierarchy (not the layout +against all class names in the widgets class hierarchy (not the layout hierarchy) in sequence, so the pattern: class "GtkButton" style "my-style" @@ -737,6 +736,9 @@ same as for styles. + + + The #GtkRcStyle structure is used to represent a set @@ -822,6 +824,7 @@ specific portions of a RC file. +@void: @Returns: @@ -845,45 +848,6 @@ specific portions of a RC file. @Returns: - - -Adds a #GtkRcStyle that will be looked up by a match against -the widget's pathname. This is equivalent to a: - widget PATTERN style STYLE -statement in a RC file. - - -@rc_style: the #GtkRcStyle to use for widgets matching @pattern -@pattern: the pattern -@Deprecated: Use gtk_rc_parse_string() with a suitable string instead. - - - - -Adds a #GtkRcStyle that will be looked up by a match against -the widget's class pathname. This is equivalent to a: -widget_class PATTERN style STYLE -statement in a RC file. - - -@rc_style: the #GtkRcStyle to use for widgets matching @pattern -@pattern: the pattern -@Deprecated: Use gtk_rc_parse_string() with a suitable string instead. - - - - -Adds a #GtkRcStyle that will be looked up by a matching against -the class hierarchy of the widget. This is equivalent to a: -class PATTERN style STYLE -statement in a RC file. - - -@rc_style: the #GtkRcStyle to use for widgets deriving from @pattern -@pattern: the pattern -@Deprecated: Use gtk_rc_parse_string() with a suitable string instead. - - Parses a given resource file. @@ -905,6 +869,7 @@ Parses resource information directly from a string. +@void: @Returns: @@ -937,6 +902,7 @@ Parses resource information directly from a string. +@void: @Returns: @@ -1018,6 +984,7 @@ otherwise %NULL. +@void: @Returns: @@ -1026,6 +993,7 @@ otherwise %NULL. +@void: @Returns: @@ -1034,6 +1002,7 @@ otherwise %NULL. +@void: @Returns: @@ -1044,6 +1013,7 @@ be installed. (GTK+ does not actually use this directory itself.) +@void: @Returns: The directory (must be freed with g_free()). @@ -1053,6 +1023,7 @@ Creates a new #GtkRcStyle with no fields set and a reference count of 1. +@void: @Returns: the newly-created #GtkRcStyle @@ -1065,22 +1036,3 @@ a reference count of 1. @Returns: - - -Increments the reference count of a #GtkRcStyle. - - -@rc_style: a #GtkRcStyle -@Deprecated: Use g_object_ref() instead - - - - -Decrements the reference count of a #GtkRcStyle and -frees if the result is 0. - - -@rc_style: a #GtkRcStyle -@Deprecated: Use g_object_unref() instead - - diff --git a/docs/reference/gtk/tmpl/gtkrecentaction.sgml b/docs/reference/gtk/tmpl/gtkrecentaction.sgml index 5fb7802f0a..d47ea4c88e 100644 --- a/docs/reference/gtk/tmpl/gtkrecentaction.sgml +++ b/docs/reference/gtk/tmpl/gtkrecentaction.sgml @@ -25,6 +25,9 @@ action for a <toolitem> element. + + + diff --git a/docs/reference/gtk/tmpl/gtkrecentchooser.sgml b/docs/reference/gtk/tmpl/gtkrecentchooser.sgml index 85013ba6f8..a491382395 100644 --- a/docs/reference/gtk/tmpl/gtkrecentchooser.sgml +++ b/docs/reference/gtk/tmpl/gtkrecentchooser.sgml @@ -25,6 +25,9 @@ Recently used files are supported since GTK+ 2.10. + + + @@ -258,24 +261,6 @@ These identify the various errors that can occur while calling @Returns: - - - - - -@chooser: -@show_numbers: - - - - - - - -@chooser: -@Returns: - - diff --git a/docs/reference/gtk/tmpl/gtkrecentchooserdialog.sgml b/docs/reference/gtk/tmpl/gtkrecentchooserdialog.sgml index d328db3af6..fd06e2b507 100644 --- a/docs/reference/gtk/tmpl/gtkrecentchooserdialog.sgml +++ b/docs/reference/gtk/tmpl/gtkrecentchooserdialog.sgml @@ -60,6 +60,9 @@ Recently used files are supported since GTK+ 2.10. + + + diff --git a/docs/reference/gtk/tmpl/gtkrecentchoosermenu.sgml b/docs/reference/gtk/tmpl/gtkrecentchoosermenu.sgml index 79d515b18c..0de670b2a8 100644 --- a/docs/reference/gtk/tmpl/gtkrecentchoosermenu.sgml +++ b/docs/reference/gtk/tmpl/gtkrecentchoosermenu.sgml @@ -40,6 +40,9 @@ Recently used files are supported since GTK+ 2.10. + + + @@ -56,6 +59,7 @@ Recently used files are supported since GTK+ 2.10. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkrecentchooserwidget.sgml b/docs/reference/gtk/tmpl/gtkrecentchooserwidget.sgml index 97a663bf33..826a5aa584 100644 --- a/docs/reference/gtk/tmpl/gtkrecentchooserwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkrecentchooserwidget.sgml @@ -29,6 +29,9 @@ Recently used files are supported since GTK+ 2.10. + + + @@ -40,6 +43,7 @@ Recently used files are supported since GTK+ 2.10. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkrecentfilter.sgml b/docs/reference/gtk/tmpl/gtkrecentfilter.sgml index c6d601d1aa..d2b1b78970 100644 --- a/docs/reference/gtk/tmpl/gtkrecentfilter.sgml +++ b/docs/reference/gtk/tmpl/gtkrecentfilter.sgml @@ -40,6 +40,9 @@ Recently used files are supported since GTK+ 2.10. + + + The GtkRecentFilter struct contains @@ -96,6 +99,7 @@ see gtk_recent_filter_add_custom(). +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkrecentmanager.sgml b/docs/reference/gtk/tmpl/gtkrecentmanager.sgml index 56a8fa0cfd..c888b6e9fe 100644 --- a/docs/reference/gtk/tmpl/gtkrecentmanager.sgml +++ b/docs/reference/gtk/tmpl/gtkrecentmanager.sgml @@ -70,6 +70,9 @@ Recently used files are supported since GTK+ 2.10. + + + Acts as a database of information about the list of recently @@ -146,6 +149,7 @@ The #GQuark used for #GtkRecentManagerError errors. +@void: @Returns: @@ -154,27 +158,10 @@ The #GQuark used for #GtkRecentManagerError errors. +@void: @Returns: - - - - - -@screen: -@Returns: - - - - - - - -@manager: -@screen: - - diff --git a/docs/reference/gtk/tmpl/gtkruler.sgml b/docs/reference/gtk/tmpl/gtkruler.sgml index c114ea57f0..2dc9a898e0 100644 --- a/docs/reference/gtk/tmpl/gtkruler.sgml +++ b/docs/reference/gtk/tmpl/gtkruler.sgml @@ -33,6 +33,9 @@ ruler. See #GtkHRuler to learn how to create a new horizontal ruler. See + + + All distances are in 1/72nd's of an inch. (According to Adobe thats a point, but diff --git a/docs/reference/gtk/tmpl/gtkscale.sgml b/docs/reference/gtk/tmpl/gtkscale.sgml index b3f5bf5b82..c2be86a754 100644 --- a/docs/reference/gtk/tmpl/gtkscale.sgml +++ b/docs/reference/gtk/tmpl/gtkscale.sgml @@ -38,6 +38,9 @@ to show at the mark. It can be translated with the usual "translatable and + + + The fields of the #GtkScale-struct struct should only be accessed via diff --git a/docs/reference/gtk/tmpl/gtkscalebutton.sgml b/docs/reference/gtk/tmpl/gtkscalebutton.sgml index a08c418092..e499ecb572 100644 --- a/docs/reference/gtk/tmpl/gtkscalebutton.sgml +++ b/docs/reference/gtk/tmpl/gtkscalebutton.sgml @@ -20,6 +20,9 @@ is tailored for this use case. + + + @@ -153,21 +156,3 @@ is tailored for this use case. @Returns: - - - - - -@button: -@orientation: - - - - - - - -@button: -@Returns: - - diff --git a/docs/reference/gtk/tmpl/gtkscrollbar.sgml b/docs/reference/gtk/tmpl/gtkscrollbar.sgml index 68705f67a9..de7c95b2fa 100644 --- a/docs/reference/gtk/tmpl/gtkscrollbar.sgml +++ b/docs/reference/gtk/tmpl/gtkscrollbar.sgml @@ -51,6 +51,9 @@ or page down (using for example the PageDown key). + + + The #GtkScrollbar struct does not contain any public data. diff --git a/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml b/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml index ef870a64c9..a35292772b 100644 --- a/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml +++ b/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml @@ -70,6 +70,9 @@ your own scrolling with #GtkScrollbar and for example a #GtkTable. + + + There are no public fields in the #GtkScrolledWindow struct; it should diff --git a/docs/reference/gtk/tmpl/gtkselection.sgml b/docs/reference/gtk/tmpl/gtkselection.sgml index ce156b7caf..6954d5fc6b 100644 --- a/docs/reference/gtk/tmpl/gtkselection.sgml +++ b/docs/reference/gtk/tmpl/gtkselection.sgml @@ -44,6 +44,9 @@ associated information. + + + A #GtkTargetEntry structure represents a single type of @@ -494,15 +497,6 @@ selection handling code. @widget: - - - - -@widget: -@event: -@Returns: - - diff --git a/docs/reference/gtk/tmpl/gtkseparator.sgml b/docs/reference/gtk/tmpl/gtkseparator.sgml index 2bff699cd8..ac3a5840f9 100644 --- a/docs/reference/gtk/tmpl/gtkseparator.sgml +++ b/docs/reference/gtk/tmpl/gtkseparator.sgml @@ -18,6 +18,9 @@ subclasses #GtkHSeparator and #GtkVSeparator. + + + The #GtkSeparator-struct struct contains private data only. diff --git a/docs/reference/gtk/tmpl/gtkseparatormenuitem.sgml b/docs/reference/gtk/tmpl/gtkseparatormenuitem.sgml index 3f0d2f9058..d3fcd5f76a 100644 --- a/docs/reference/gtk/tmpl/gtkseparatormenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkseparatormenuitem.sgml @@ -19,6 +19,9 @@ make it appear sunken into the interface. + + + The #GtkSeparatorMenuItem-struct struct contains private data only, and @@ -31,6 +34,7 @@ should be accessed using the functions below. Creates a new #GtkSeparatorMenuItem. +@void: @Returns: a new #GtkSeparatorMenuItem. diff --git a/docs/reference/gtk/tmpl/gtkseparatortoolitem.sgml b/docs/reference/gtk/tmpl/gtkseparatortoolitem.sgml index 6136bdb62b..ac868fa1c2 100644 --- a/docs/reference/gtk/tmpl/gtkseparatortoolitem.sgml +++ b/docs/reference/gtk/tmpl/gtkseparatortoolitem.sgml @@ -37,6 +37,9 @@ to the ends of the toolbar. + + + The #GtkSeparatorToolItem struct contains only private data and @@ -54,6 +57,7 @@ should only be accessed through the functions described below. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtksettings.sgml b/docs/reference/gtk/tmpl/gtksettings.sgml index c90c2395a0..f2b7fb4820 100644 --- a/docs/reference/gtk/tmpl/gtksettings.sgml +++ b/docs/reference/gtk/tmpl/gtksettings.sgml @@ -45,6 +45,9 @@ GtkSettings instance for the default screen. + + + @@ -394,6 +397,7 @@ GtkSettings instance for the default screen. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtksizegroup.sgml b/docs/reference/gtk/tmpl/gtksizegroup.sgml index 7784e3a1a5..4bf90cec62 100644 --- a/docs/reference/gtk/tmpl/gtksizegroup.sgml +++ b/docs/reference/gtk/tmpl/gtksizegroup.sgml @@ -76,6 +76,9 @@ of the size group. The name attribute gives the id of the widget. + + + diff --git a/docs/reference/gtk/tmpl/gtkspinbutton.sgml b/docs/reference/gtk/tmpl/gtkspinbutton.sgml index f9f24d10b3..0ed732daf3 100644 --- a/docs/reference/gtk/tmpl/gtkspinbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkspinbutton.sgml @@ -99,6 +99,9 @@ void create_floating_spin_button (void) { + + + entry is the #GtkEntry part of the #GtkSpinButton @@ -324,17 +327,6 @@ Creates a new #GtkSpinButton. @max: - - -Gets the value in the @spin_button. - - -@Returns: the value of @spin_button -@Deprecated: Use gtk_spin_button_get_value() instead. - -@spin_button: a #GtkSpinButton - - diff --git a/docs/reference/gtk/tmpl/gtkstatusbar.sgml b/docs/reference/gtk/tmpl/gtkstatusbar.sgml index a012d508ba..2d860995e3 100644 --- a/docs/reference/gtk/tmpl/gtkstatusbar.sgml +++ b/docs/reference/gtk/tmpl/gtkstatusbar.sgml @@ -49,6 +49,9 @@ recorded at the time it was added. This is done using gtk_statusbar_remove(). + + + Contains private data that should be modified with the functions described @@ -89,6 +92,7 @@ below. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkstatusicon.sgml b/docs/reference/gtk/tmpl/gtkstatusicon.sgml index b834c81fa5..b399ea8b5a 100644 --- a/docs/reference/gtk/tmpl/gtkstatusicon.sgml +++ b/docs/reference/gtk/tmpl/gtkstatusicon.sgml @@ -42,6 +42,9 @@ on Win32 doesn't allow to embed arbitrary widgets. + + + @@ -197,6 +200,7 @@ on Win32 doesn't allow to embed arbitrary widgets. +@void: @Returns: @@ -362,15 +366,6 @@ on Win32 doesn't allow to embed arbitrary widgets. @Returns: - - - - - -@status_icon: -@tooltip_text: - - diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml index ffe567106d..b8f2dce560 100644 --- a/docs/reference/gtk/tmpl/gtkstyle.sgml +++ b/docs/reference/gtk/tmpl/gtkstyle.sgml @@ -17,6 +17,9 @@ Functions for drawing widget parts + + + Returns whether the style is attached to a window. @@ -74,6 +77,7 @@ Returns whether the style is attached to a window. +@void: @Returns: @@ -104,23 +108,6 @@ Returns whether the style is attached to a window. @style: - - - - - -@style: -@Returns: - - - - - - - -@style: - - @@ -147,22 +134,6 @@ Returns whether the style is attached to a window. @height: - - -Does the same as gtk_style_apply_default_background(). - - -@s: -@gw: -@st: -@a: -@x: -@y: -@w: -@h: -@Deprecated: Use gtk_style_apply_default_background() instead. - - @@ -174,16 +145,6 @@ Does the same as gtk_style_apply_default_background(). @Returns: - - - - - -@style: -@stock_id: -@Returns: - - @@ -199,24 +160,6 @@ Does the same as gtk_style_apply_default_background(). @Returns: - - - - - -@style: -@Returns: - - - - - - - -@style: -@font: - - @@ -545,22 +488,6 @@ Does the same as gtk_style_apply_default_background(). @height: - - - - - -@style: -@window: -@state_type: -@area: -@widget: -@detail: -@x: -@y: -@string: - - @@ -676,6 +603,7 @@ be of different width on each side. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtktable.sgml b/docs/reference/gtk/tmpl/gtktable.sgml index 25e36e7844..4a0d7cae74 100644 --- a/docs/reference/gtk/tmpl/gtktable.sgml +++ b/docs/reference/gtk/tmpl/gtktable.sgml @@ -47,6 +47,9 @@ table will resize themselves to the size of the largest widget in the table. + + + The GtkTable structure holds the data for the actual table itself. diff --git a/docs/reference/gtk/tmpl/gtktearoffmenuitem.sgml b/docs/reference/gtk/tmpl/gtktearoffmenuitem.sgml index 2f2560bb0d..450c4aa09a 100644 --- a/docs/reference/gtk/tmpl/gtktearoffmenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtktearoffmenuitem.sgml @@ -39,6 +39,9 @@ menu window. + + + The #GtkTearoffMenuItem-struct struct contains private data only, and @@ -51,6 +54,7 @@ should be accessed using the functions below. Creates a new #GtkTearoffMenuItem. +@void: @Returns: a new #GtkTearoffMenuItem. diff --git a/docs/reference/gtk/tmpl/gtktextbuffer.sgml b/docs/reference/gtk/tmpl/gtktextbuffer.sgml index 802d74bf3b..f7cfdef356 100644 --- a/docs/reference/gtk/tmpl/gtktextbuffer.sgml +++ b/docs/reference/gtk/tmpl/gtktextbuffer.sgml @@ -24,6 +24,9 @@ types related to the text widget and how they work together. + + + diff --git a/docs/reference/gtk/tmpl/gtktextiter.sgml b/docs/reference/gtk/tmpl/gtktextiter.sgml index c7cf653623..33f00f8e72 100644 --- a/docs/reference/gtk/tmpl/gtktextiter.sgml +++ b/docs/reference/gtk/tmpl/gtktextiter.sgml @@ -23,6 +23,9 @@ types related to the text widget and how they work together. + + + diff --git a/docs/reference/gtk/tmpl/gtktextmark.sgml b/docs/reference/gtk/tmpl/gtktextmark.sgml index 0db80bf7a0..a15b76271f 100644 --- a/docs/reference/gtk/tmpl/gtktextmark.sgml +++ b/docs/reference/gtk/tmpl/gtktextmark.sgml @@ -56,6 +56,9 @@ Marks are typically created using the gtk_text_buffer_create_mark() function. + + + diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml index c52ee0f974..3126342702 100644 --- a/docs/reference/gtk/tmpl/gtktexttag.sgml +++ b/docs/reference/gtk/tmpl/gtktexttag.sgml @@ -34,6 +34,9 @@ It is working (with minor issues) since 2.8. + + + @@ -477,6 +480,7 @@ modified directly. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtktexttagtable.sgml b/docs/reference/gtk/tmpl/gtktexttagtable.sgml index ab1341f37e..748682f2d5 100644 --- a/docs/reference/gtk/tmpl/gtktexttagtable.sgml +++ b/docs/reference/gtk/tmpl/gtktexttagtable.sgml @@ -24,6 +24,9 @@ types related to the text widget and how they work together. + + + @@ -69,6 +72,7 @@ types related to the text widget and how they work together. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtktextview.sgml b/docs/reference/gtk/tmpl/gtktextview.sgml index 2da1a2aac9..bd8168d015 100644 --- a/docs/reference/gtk/tmpl/gtktextview.sgml +++ b/docs/reference/gtk/tmpl/gtktextview.sgml @@ -23,6 +23,9 @@ types related to the text widget and how they work together. + + + @@ -254,6 +257,7 @@ types related to the text widget and how they work together. +@void: @Returns: @@ -284,6 +288,24 @@ types related to the text widget and how they work together. @Returns: + + + + + +@text_view: +@Returns: + + + + + + + +@text_view: +@Returns: + + @@ -554,6 +576,7 @@ multiple views. +@void: @Returns: @@ -841,6 +864,24 @@ multiple views. @Returns: + + + + + +@text_view: +@event: +@Returns: + + + + + + + +@text_view: + + The priority at which the text view validates onscreen lines diff --git a/docs/reference/gtk/tmpl/gtktoggleaction.sgml b/docs/reference/gtk/tmpl/gtktoggleaction.sgml index c6ceec7b55..79a2455e31 100644 --- a/docs/reference/gtk/tmpl/gtktoggleaction.sgml +++ b/docs/reference/gtk/tmpl/gtktoggleaction.sgml @@ -18,6 +18,9 @@ A #GtkToggleAction corresponds roughly to a #GtkCheckMenuItem. It has an + + + The GtkToggleAction struct contains only diff --git a/docs/reference/gtk/tmpl/gtktogglebutton.sgml b/docs/reference/gtk/tmpl/gtktogglebutton.sgml index 5e8282afa7..815d6a480b 100644 --- a/docs/reference/gtk/tmpl/gtktogglebutton.sgml +++ b/docs/reference/gtk/tmpl/gtktogglebutton.sgml @@ -80,6 +80,9 @@ void make_toggles (void) { + + + The #GtkToggleButton struct contains private data only, and should be manipulated using the functions below. @@ -114,6 +117,7 @@ Should be connected if you wish to perform an action whenever the Creates a new toggle button. A widget should be packed into the button, as in gtk_button_new(). +@void: @Returns: a new toggle button. diff --git a/docs/reference/gtk/tmpl/gtktoggletoolbutton.sgml b/docs/reference/gtk/tmpl/gtktoggletoolbutton.sgml index 21a12e9dec..738e4b9291 100644 --- a/docs/reference/gtk/tmpl/gtktoggletoolbutton.sgml +++ b/docs/reference/gtk/tmpl/gtktoggletoolbutton.sgml @@ -45,6 +45,9 @@ A GtkToolItem containing a toggle button + + + The #GtkToggleToolButton struct contains only private data and @@ -69,6 +72,7 @@ A GtkToolItem containing a toggle button +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml index 86c59d672c..6539b7497f 100644 --- a/docs/reference/gtk/tmpl/gtktoolbar.sgml +++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml @@ -41,6 +41,9 @@ the #GtkToolbar::popup-context-menu signal. + + + The #GtkToolbar struct only contains private data and should only be @@ -104,11 +107,6 @@ accessed through the function described below. - - - - - @@ -184,6 +182,7 @@ to a #GtkToolbar. +@void: @Returns: the newly-created toolbar. @@ -256,24 +255,6 @@ to a #GtkToolbar. @show_arrow: - - - - - -@toolbar: -@orientation: - - - - - - - -@toolbar: -@enable: - - @@ -291,15 +272,6 @@ to a #GtkToolbar. @Returns: - - - - - -@toolbar: -@Returns: - - @@ -318,15 +290,6 @@ to a #GtkToolbar. @Returns: - - - - - -@toolbar: -@Returns: - - @@ -336,166 +299,6 @@ to a #GtkToolbar. @Returns: - - - - - -@toolbar: -@text: -@tooltip_text: -@tooltip_private_text: -@icon: -@callback: -@user_data: -@Returns: - - - - - - - -@toolbar: -@text: -@tooltip_text: -@tooltip_private_text: -@icon: -@callback: -@user_data: -@Returns: - - - - - - - -@toolbar: -@text: -@tooltip_text: -@tooltip_private_text: -@icon: -@callback: -@user_data: -@position: -@Returns: - - - - - - - -@toolbar: - - - - - - - -@toolbar: - - - - - - - -@toolbar: -@position: - - - - - - - - - - -@toolbar: -@type: -@widget: -@text: -@tooltip_text: -@tooltip_private_text: -@icon: -@callback: -@user_data: -@Returns: - - - - - - - -@toolbar: -@type: -@widget: -@text: -@tooltip_text: -@tooltip_private_text: -@icon: -@callback: -@user_data: -@Returns: - - - - - - - -@toolbar: -@type: -@widget: -@text: -@tooltip_text: -@tooltip_private_text: -@icon: -@callback: -@user_data: -@position: -@Returns: - - - - - - - -@toolbar: -@widget: -@tooltip_text: -@tooltip_private_text: - - - - - - - -@toolbar: -@widget: -@tooltip_text: -@tooltip_private_text: - - - - - - - -@toolbar: -@widget: -@tooltip_text: -@tooltip_private_text: -@position: - - @@ -505,21 +308,6 @@ to a #GtkToolbar. @style: - - - - - -@toolbar: -@stock_id: -@tooltip_text: -@tooltip_private_text: -@callback: -@user_data: -@position: -@Returns: - - @@ -529,15 +317,6 @@ to a #GtkToolbar. @icon_size: - - - - - -@toolbar: -@position: - - diff --git a/docs/reference/gtk/tmpl/gtktoolbutton.sgml b/docs/reference/gtk/tmpl/gtktoolbutton.sgml index 95561b6091..10d9e1d9fc 100644 --- a/docs/reference/gtk/tmpl/gtktoolbutton.sgml +++ b/docs/reference/gtk/tmpl/gtktoolbutton.sgml @@ -72,6 +72,9 @@ the button does not have a icon. + + + The #GtkToolButton struct contains only private. It should only be diff --git a/docs/reference/gtk/tmpl/gtktoolitem.sgml b/docs/reference/gtk/tmpl/gtktoolitem.sgml index ecef9107ff..f4287ed1ec 100644 --- a/docs/reference/gtk/tmpl/gtktoolitem.sgml +++ b/docs/reference/gtk/tmpl/gtktoolitem.sgml @@ -17,29 +17,21 @@ GtkToolItem - - + - - - + -@toolitem: the object which received the signal. -@Returns: - + @toolitem: the object which received the signal. -@arg1: -@arg2: -@arg3: @Returns: @@ -69,6 +61,7 @@ GtkToolItem +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtktooltip.sgml b/docs/reference/gtk/tmpl/gtktooltip.sgml index 71edd3584e..15a8f4374b 100644 --- a/docs/reference/gtk/tmpl/gtktooltip.sgml +++ b/docs/reference/gtk/tmpl/gtktooltip.sgml @@ -79,6 +79,9 @@ return %TRUE to show the window, %FALSE to not show it. + + + diff --git a/docs/reference/gtk/tmpl/gtktreednd.sgml b/docs/reference/gtk/tmpl/gtktreednd.sgml index 9d9273fc2d..a45f8219ed 100644 --- a/docs/reference/gtk/tmpl/gtktreednd.sgml +++ b/docs/reference/gtk/tmpl/gtktreednd.sgml @@ -33,6 +33,9 @@ and auto-scroll, but your models have to implement the + + + diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml index d635009210..07dcd45d0e 100644 --- a/docs/reference/gtk/tmpl/gtktreemodel.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml @@ -196,6 +196,9 @@ enum + + + @@ -327,6 +330,7 @@ section. +@void: @Returns: @@ -363,19 +367,10 @@ section. +@void: @Returns: - - -An alternate name for gtk_tree_path_new_first() provided for -compatibility reasons. - - -@Returns: A new #GtkTreePath. -@Deprecated: Use gtk_tree_path_new_first() instead. - - @@ -417,7 +412,7 @@ compatibility reasons. -@path: +@path: @depth: @Returns: @@ -674,18 +669,6 @@ compatibility reasons. @Returns: - - -A alternate name for gtk_tree_model_get_iter_first() provided for -compatibility reasons; this macro will be deprecated in future -versions of GTK+. - - -@tree_model: A #GtkTreeModel. -@iter: uninitialized #GtkTreeIter. -@Returns: %TRUE, if @iter was set. - - diff --git a/docs/reference/gtk/tmpl/gtktreemodelfilter.sgml b/docs/reference/gtk/tmpl/gtktreemodelfilter.sgml index bd6d1e31b0..cda44ec325 100644 --- a/docs/reference/gtk/tmpl/gtktreemodelfilter.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodelfilter.sgml @@ -37,6 +37,9 @@ a #GtkTreePath indicating the root node for the filter at construction time. + + + The GtkTreeModelFilter struct contains only private fields. diff --git a/docs/reference/gtk/tmpl/gtktreemodelsort.sgml b/docs/reference/gtk/tmpl/gtktreemodelsort.sgml index b023f1af05..1582216b25 100644 --- a/docs/reference/gtk/tmpl/gtktreemodelsort.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodelsort.sgml @@ -121,6 +121,9 @@ selection_changed (GtkTreeSelection *selection, gpointer data) + + + This should not be accessed directly. Use the accessor functions below. diff --git a/docs/reference/gtk/tmpl/gtktreeselection.sgml b/docs/reference/gtk/tmpl/gtktreeselection.sgml index e5a9b92ec7..9407aaa11e 100644 --- a/docs/reference/gtk/tmpl/gtktreeselection.sgml +++ b/docs/reference/gtk/tmpl/gtktreeselection.sgml @@ -43,6 +43,9 @@ selected row). + + + diff --git a/docs/reference/gtk/tmpl/gtktreesortable.sgml b/docs/reference/gtk/tmpl/gtktreesortable.sgml index 967add62e2..f5ebb8f6d8 100644 --- a/docs/reference/gtk/tmpl/gtktreesortable.sgml +++ b/docs/reference/gtk/tmpl/gtktreesortable.sgml @@ -19,6 +19,9 @@ to sort the model. + + + diff --git a/docs/reference/gtk/tmpl/gtktreestore.sgml b/docs/reference/gtk/tmpl/gtktreestore.sgml index f3c5c97ad8..efa84558c0 100644 --- a/docs/reference/gtk/tmpl/gtktreestore.sgml +++ b/docs/reference/gtk/tmpl/gtktreestore.sgml @@ -44,6 +44,9 @@ column. The "type" attribute specifies the data type for the column. + + + diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml index 7422057efe..549b2e6212 100644 --- a/docs/reference/gtk/tmpl/gtktreeview.sgml +++ b/docs/reference/gtk/tmpl/gtktreeview.sgml @@ -77,6 +77,9 @@ GtkTreeViewColumn objects as <child> elements in UI definitions. + + + @@ -447,6 +450,7 @@ has some similarity to strcmp() returning 0 for equal strings. +@void: @Returns: @@ -953,30 +957,6 @@ has some similarity to strcmp() returning 0 for equal strings. @Returns: - - - - - -@tree_view: -@wx: -@wy: -@tx: -@ty: - - - - - - - -@tree_view: -@tx: -@ty: -@wx: -@wy: - - diff --git a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml index 26cd00a4b9..5340150e27 100644 --- a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml +++ b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml @@ -26,6 +26,9 @@ they work together. + + + The sizing method the column uses to determine its width. Please note @@ -157,6 +160,7 @@ calling gtk_tree_view_column_set_cell_data_func() +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtktypeutils.sgml b/docs/reference/gtk/tmpl/gtktypeutils.sgml index 861c9943b5..69a4a26520 100644 --- a/docs/reference/gtk/tmpl/gtktypeutils.sgml +++ b/docs/reference/gtk/tmpl/gtktypeutils.sgml @@ -18,154 +18,7 @@ managed at runtime. - - -#GtkType is unique integer identifying the type. The guts of the -information about the type is held in a private struct named -#GtkTypeNode. - - - - - -#GtkFundamentalType is an enumerated type which lists all the possible -fundamental types (e.g. char, uchar, int, -long, float, etc). - - - - - -Returns the type name of @class. - - -@class: a #GtkTypeClass. -@Deprecated: Use g_type_name() and G_TYPE_FROM_CLASS() instead. - - - - -Returns the type of @class. - - -@class: a #GtkTypeClass. -@Deprecated: Use G_TYPE_FROM_CLASS() instead. - - - - -Returns %TRUE if @type is a %GTK_TYPE_OBJECT. - - -@type: a #GtkType. -@Deprecated: Use G_TYPE_IS_OBJECT() instead. - - - - -The highest-numbered structured or flat enumerated type value. - - -@Deprecated: Use #G_TYPE_LAST_RESERVED_FUNDAMENTAL - 1 instead. - - - - -The maximum fundamental enumerated type value. - - -@Deprecated: Use #G_TYPE_FUNDAMENTAL_MAX instead. - - - - -Use in place of offsetof(), which is used if it exists. - - -@Deprecated: Use G_STRUCT_OFFSET() instead. - - - - -Casts the object in @tobj into @cast. If %G_DISABLE_CAST_CHECKS is -defined, just cast it. Otherwise, check to see if we can cast @tobj -into a @cast. - - - - - - -Casts the object in @tobj into @cast. If %G_DISABLE_CAST_CHECKS is -defined, just cast it. Otherwise, check to see if we can cast @tobj -into a @cast. - - - -@tclass: a #GtkClassInitFunc -@cast_type: a GTK+ type. -@cast: a C type - - - - -Determines whether @type_object is a type of @otype. - - - -@type_object: a #GtkTypeObject object - - - - -Determines whether @type_class is a type of @otype. - - - -@type_class: a #GtkTypeClass class. - - - - -Gets the class of @tobj. - - - -@tobj: a #GtkObject. - - - - -Converts a GTK+ type into a fundamental type. - - - - - - -Just a macroized cast into a #GtkSignalFunc. - - -@f: - - - - -Defines a function pointer. - - - - - -Defines a function pointer. - - - - - -Defines a function pointer. - - + @@ -177,14 +30,6 @@ Defines a function pointer. @Returns: #gint - - -Defines a function pointer. - - -@data: #gpointer - - Defines a function pointer. @@ -196,21 +41,6 @@ Defines a function pointer. @args: #GtkArg* - - -Defines a function pointer. - - - - - -A #GtkTypeObject defines the minimum structure requirements -for type instances. Type instances returned from gtk_type_new () -and initialized through a #GtkObjectInitFunc need to directly inherit -from this structure or at least copy its fields one by one. - - - This is a structure that we use to pass in typed values (and names). @@ -219,407 +49,3 @@ This is a structure that we use to pass in typed values (and names). @type: @name: - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_CHAR. - - -@a: a #GtkArg. - - - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_UCHAR. - - -@a: a #GtkArg. - - - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_BOOL. - - -@a: a #GtkArg. - - - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_INT. - - -@a: a #GtkArg. - - - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_UINT. - - -@a: a #GtkArg. - - - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_LONG. - - -@a: a #GtkArg. - - - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_ULONG. - - -@a: a #GtkArg. - - - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_FLOAT. - - -@a: a #GtkArg. - - - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_DOUBLE. - - -@a: a #GtkArg. - - - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_STRING. - - -@a: a #GtkArg. - - - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_ENUM. - - -@a: a #GtkArg. - - - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_FLAGS. - - -@a: a #GtkArg. - - - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_BOXED. - - -@a: a #GtkArg. - - - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_POINTER. - - -@a: a #GtkArg. - - - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_OBJECT. - - -@a: a #GtkArg. - - - - -Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_SIGNAL. - - -@a: a #GtkArg. - - - - -If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_CHAR. - - -@a: a #GtkArg. - - - - -If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_UCHAR. - - -@a: a #GtkArg. - - - - -If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_BOOL. - - -@a: a #GtkArg. - - - - -If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_INT. - - -@a: a #GtkArg. - - - - -If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_UINT. - - -@a: a #GtkArg. - - - - -If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_LONG. - - -@a: a #GtkArg. - - - - -If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_ULONG. - - -@a: a #GtkArg. - - - - -If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_FLOAT. - - -@a: a #GtkArg. - - - - -If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_DOUBLE. - - -@a: a #GtkArg. - - - - -If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_STRING. - - -@a: a #GtkArg. - - - - -If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_ENUM. - - -@a: a #GtkArg. - - - - -If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_FLAGS. - - -@a: a #GtkArg. - - - - -If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_BOXED. - - -@a: a #GtkArg. - - - - -If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_POINTER. - - -@a: a #GtkArg. - - - - -If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_OBJECT. - - -@a: a #GtkArg. - - - - -Holds information about the type. gtk_type_name() returns the name. -@object_size is somehow set to the number of bytes that an instance of -the object will occupy. @class_init_func holds the type's -initialization function. @object_init_func holds the initialization -function for an instance of the object. @reserved_1 is used for -#GtkEnumValue to hold the enumerated values. - - -@type_name: -@object_size: -@class_size: -@class_init_func: -@object_init_func: -@reserved_1: -@reserved_2: -@base_class_init_func: - - - -The base structure for a GTK+ type. Every type inherits this as a base structure. - - - - - -A structure which contains a single enum value, and its name, and its -nickname. - - - - - - - - - - - -Initializes the data structures associated with GTK+ types. - - -@debug_flags: debug flags - - - - -Creates a new, unique type. - - -@parent_type: if zero, a fundamental type is created -@gtkinfo: must not be %NULL, and @type_info->type_name must also not be %NULL -@Returns: the new #GtkType - - - - -Returns a pointer to the name of a type, or %NULL if it has none. - - -@type: a #GtkType. -@Returns: a pointer to the name of a type, or %NULL if it has none. - - - - -Gets the internal representation of a type, given its name. - - -@name: the name of a GTK+ type -@Returns: a #GtkType. - - - - -Returns the parent type of a #GtkType. - - -@type: a #GtkType. -@Returns: the #GtkType of the parent. - - - - -Returns a pointer pointing to the class of @type or %NULL if there was -any trouble identifying @type. Initializes the class if necessary. - - -@type: a #GtkType. -@Returns: pointer to the class. - - - - -Creates a new object of a given type, and return a pointer to it. -Returns %NULL if you give it an invalid type. It allocates the object -out of the type's memory chunk if there is a memory chunk. The object -has all the proper initializers called. - - -@type: a #GtkType. -@Returns: pointer to a #GtkTypeObject. - - - - -Looks in the type hierarchy to see if @type has @is_a_type among its -ancestors. Do so with a simple lookup, not a loop. - - -@type: a #GtkType. -@is_a_type: another #GtkType. -@Returns: %TRUE if @type is a @is_a_type. - - - - -If @enum_type has values, then return a pointer to all of them. - - -@enum_type: a #GtkType. -@Returns: #GtkEnumValue* - - - - -If @flags_type has values, then return a pointer to all of them. - - -@flags_type: a #GtkType. -@Returns: #GtkFlagValue* - - - - -Returns a pointer to one of @enum_type's #GtkEnumValues's whose name (or nickname) matches @value_name. - - -@enum_type: a #GtkType. -@value_name: the name to look for. -@Returns: #GtkEnumValue* - - - - -Returns a pointer to one of @flag_type's #GtkFlagValue's whose name (or nickname) matches @value_name. - - -@flags_type: a #GtkType. -@value_name: the name to look for. -@Returns: #GtkFlagValue* - -@flag_type: GtkType - - diff --git a/docs/reference/gtk/tmpl/gtkuimanager.sgml b/docs/reference/gtk/tmpl/gtkuimanager.sgml index 22f5d8b848..68b8700df5 100644 --- a/docs/reference/gtk/tmpl/gtkuimanager.sgml +++ b/docs/reference/gtk/tmpl/gtkuimanager.sgml @@ -253,6 +253,9 @@ other parts of the constructed user interface with the help of the + + + The GtkUIManager struct contains only private @@ -324,6 +327,7 @@ members and should not be accessed directly. +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml index 69a9688fdf..07c39b05b8 100644 --- a/docs/reference/gtk/tmpl/gtkwindow.sgml +++ b/docs/reference/gtk/tmpl/gtkwindow.sgml @@ -40,6 +40,9 @@ window (synonymous with gtk_window_add_accel_group(). + + + @@ -427,6 +430,7 @@ window (synonymous with gtk_window_add_accel_group(). +@void: @Returns: @@ -784,6 +788,7 @@ window (synonymous with gtk_window_add_accel_group(). +@void: @Returns: @@ -792,6 +797,7 @@ window (synonymous with gtk_window_add_accel_group(). +@void: @Returns: diff --git a/docs/reference/gtk/tmpl/gtkwindowgroup.sgml b/docs/reference/gtk/tmpl/gtkwindowgroup.sgml index 622de268e4..becadf0c5d 100644 --- a/docs/reference/gtk/tmpl/gtkwindowgroup.sgml +++ b/docs/reference/gtk/tmpl/gtkwindowgroup.sgml @@ -17,6 +17,9 @@ Limit the effect of grabs + + + @@ -28,6 +31,7 @@ Limit the effect of grabs +@void: @Returns: diff --git a/gdk-2.0-uninstalled.pc.in b/gdk-3.0-uninstalled.pc.in similarity index 84% rename from gdk-2.0-uninstalled.pc.in rename to gdk-3.0-uninstalled.pc.in index f945a3f3b7..45adcf0f06 100644 --- a/gdk-2.0-uninstalled.pc.in +++ b/gdk-3.0-uninstalled.pc.in @@ -3,6 +3,6 @@ target=@gdktarget@ Name: GDK Uninstalled Description: GTK+ Drawing Kit (${target} target), Not Installed Version: @VERSION@ -Requires: gdk-pixbuf-2.0-uninstalled @GDK_PACKAGES@ +Requires: gdk-pixbuf-@GTK_API_VERSION@-uninstalled @GDK_PACKAGES@ Libs: ${pc_top_builddir}/${pcfiledir}/gdk/libgdk-${target}-@GTK_API_VERSION@.la @GDK_EXTRA_LIBS@ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gdk -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GDK_EXTRA_CFLAGS@ diff --git a/gdk-2.0.pc.in b/gdk-3.0.pc.in similarity index 60% rename from gdk-2.0.pc.in rename to gdk-3.0.pc.in index 24a5dfb72c..ca12b2eef2 100644 --- a/gdk-2.0.pc.in +++ b/gdk-3.0.pc.in @@ -7,6 +7,6 @@ target=@gdktarget@ Name: GDK Description: GTK+ Drawing Kit (${target} target) Version: @VERSION@ -Requires: gdk-pixbuf-2.0 @GDK_PACKAGES@ +Requires: gdk-pixbuf-@GTK_API_VERSION@ @GDK_PACKAGES@ Libs: -L${libdir} -lgdk-${target}-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@ -Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @GDK_EXTRA_CFLAGS@ +Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ -I${libdir}/gtk-@GTK_API_VERSION@/include @GDK_EXTRA_CFLAGS@ diff --git a/gdk-pixbuf-2.0-uninstalled.pc.in b/gdk-pixbuf-3.0-uninstalled.pc.in similarity index 100% rename from gdk-pixbuf-2.0-uninstalled.pc.in rename to gdk-pixbuf-3.0-uninstalled.pc.in diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-3.0.pc.in similarity index 79% rename from gdk-pixbuf-2.0.pc.in rename to gdk-pixbuf-3.0.pc.in index b3b09154de..e65398b8f0 100644 --- a/gdk-pixbuf-2.0.pc.in +++ b/gdk-pixbuf-3.0.pc.in @@ -8,5 +8,5 @@ Description: Image loading and scaling Version: @VERSION@ Requires: gobject-2.0,gmodule-no-export-2.0 Libs: -L${libdir} -lgdk_pixbuf-@GTK_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@ -Cflags: -I${includedir}/gtk-2.0 @GDK_PIXBUF_EXTRA_CFLAGS@ +Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@ diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 52fd710270..c5606f5600 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -62,9 +62,9 @@ TESTS = abicheck.sh pltcheck.sh endif lib_LTLIBRARIES = \ - libgdk_pixbuf-2.0.la + libgdk_pixbuf-3.0.la -loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders +loaderdir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/loaders module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) @@ -524,21 +524,21 @@ LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) noinst_PROGRAMS = test-gdk-pixbuf test_gdk_pixbuf_LDADD = $(LDADDS) -bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders -gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c -gdk_pixbuf_csource_LDADD = $(LDADDS) +bin_PROGRAMS = gdk-pixbuf-csource-3.0 gdk-pixbuf-query-loaders-3.0 +gdk_pixbuf_csource_3_0_SOURCES = gdk-pixbuf-csource.c +gdk_pixbuf_csource_3_0_LDADD = $(LDADDS) -gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) -gdk_pixbuf_query_loaders_LDADD = $(LDADDS) +gdk_pixbuf_query_loaders_3_0_DEPENDENCIES = $(DEPS) +gdk_pixbuf_query_loaders_3_0_LDADD = $(LDADDS) -gdk_pixbuf_query_loaders_SOURCES = queryloaders.c +gdk_pixbuf_query_loaders_3_0_SOURCES = queryloaders.c # # The GdkPixBuf library # -libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf -libgdk_pixbuf_2_0_la_SOURCES = \ +libgdk_pixbufincludedir = $(includedir)/gtk-3.0/gdk-pixbuf +libgdk_pixbuf_3_0_la_SOURCES = \ gdk-pixbuf-i18n.h \ gdk-pixbuf.c \ gdk-pixbuf-animation.c \ @@ -552,7 +552,7 @@ libgdk_pixbuf_2_0_la_SOURCES = \ gdk-pixdata.c \ gdk-pixbuf-enum-types.c -libgdk_pixbuf_2_0_la_LDFLAGS = \ +libgdk_pixbuf_3_0_la_LDFLAGS = \ $(gdk_pixbuf_win32_res_ldflag) \ -version-info $(LT_VERSION_INFO) \ $(LIBTOOL_EXPORT_OPTIONS) \ @@ -560,8 +560,8 @@ libgdk_pixbuf_2_0_la_LDFLAGS = \ $(gdk_pixbuf_symbols) -libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) $(libole32) -libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res) +libgdk_pixbuf_3_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) $(libole32) +libgdk_pixbuf_3_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res) gdk_pixbuf_headers = \ gdk-pixbuf.h \ @@ -677,15 +677,15 @@ EXTRA_DIST += \ if HAVE_INTROSPECTION -GdkPixbuf-2.0.gir: libgdk_pixbuf-2.0.la Makefile -GdkPixbuf_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk -GdkPixbuf_2_0_gir_INCLUDES = GModule-2.0 Gio-2.0 -GdkPixbuf_2_0_gir_LIBS = libgdk_pixbuf-2.0.la -GdkPixbuf_2_0_gir_CFLAGS = $(INCLUDES) -GdkPixbuf_2_0_gir_FILES = \ +GdkPixbuf-3.0.gir: libgdk_pixbuf-3.0.la Makefile +GdkPixbuf_3_0_gir_SCANNERFLAGS = --strip-prefix=Gdk +GdkPixbuf_3_0_gir_INCLUDES = GModule-2.0 Gio-2.0 +GdkPixbuf_3_0_gir_LIBS = libgdk_pixbuf-3.0.la +GdkPixbuf_3_0_gir_CFLAGS = $(INCLUDES) +GdkPixbuf_3_0_gir_FILES = \ $(addprefix $(srcdir)/,$(libgdk_pixbufinclude_HEADERS)) \ - $(addprefix $(srcdir)/,$(libgdk_pixbuf_2_0_la_SOURCES)) -INTROSPECTION_GIRS += GdkPixbuf-2.0.gir + $(addprefix $(srcdir)/,$(libgdk_pixbuf_3_0_la_SOURCES)) +INTROSPECTION_GIRS += GdkPixbuf-3.0.gir girdir = $(datadir)/gir-1.0 dist_gir_DATA = $(INTROSPECTION_GIRS) @@ -710,19 +710,19 @@ endif # after the libraries are installed in their final locations. install-data-hook: install-ms-lib install-def-file @if $(RUN_QUERY_LOADER_TEST) ; then \ - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ - $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \ + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-3.0 ; \ + $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0 > $(DESTDIR)$(sysconfdir)/gtk-3.0/gdk-pixbuf.loaders ; \ else \ echo "***" ; \ echo "*** Warning: gdk-pixbuf.loaders not built" ; \ echo "***" ; \ echo "*** Generate this file manually on host" ; \ - echo "*** system using gdk-pixbuf-query-loaders" ; \ + echo "*** system using gdk-pixbuf-query-loaders-3.0" ; \ echo "***" ; \ fi uninstall-local: uninstall-ms-lib uninstall-def-file - rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders + rm -f $(DESTDIR)$(sysconfdir)/gtk-3.0/gdk-pixbuf.loaders if CROSS_COMPILING else @@ -730,11 +730,11 @@ all-local: gdk-pixbuf.loaders endif if BUILD_DYNAMIC_MODULES -gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders$(EXEEXT) +gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders-3.0$(EXEEXT) LOADERS=`echo libpixbufloader-*.la` ; \ if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \ echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \ - $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./gdk-pixbuf.loaders ;\ + $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0 $$LOADERS > ./gdk-pixbuf.loaders ;\ else \ echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \ touch gdk-pixbuf.loaders; \ diff --git a/gdk-pixbuf/gdk-pixbuf-csource.c b/gdk-pixbuf/gdk-pixbuf-csource.c index b774d0c180..c9b0d4f238 100644 --- a/gdk-pixbuf/gdk-pixbuf-csource.c +++ b/gdk-pixbuf/gdk-pixbuf-csource.c @@ -31,8 +31,8 @@ /* --- defines --- */ #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "Gdk-Pixbuf-CSource" -#define PRG_NAME "gdk-pixbuf-csource" -#define PKG_NAME "Gtk+" +#define PRG_NAME "gdk-pixbuf-csource-3.0" +#define PKG_NAME "GTK+" #define PKG_HTTP_HOME "http://www.gtk.org" diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c index 71805d43ee..e9b5fc4b47 100644 --- a/gdk-pixbuf/queryloaders.c +++ b/gdk-pixbuf/queryloaders.c @@ -274,7 +274,7 @@ int main (int argc, char **argv) "# Automatically generated file, do not edit\n" "# Created by %s from gtk+-%s\n" "#\n", - (prgname ? prgname : "gdk-pixbuf-query-loaders"), + (prgname ? prgname : "gdk-pixbuf-query-loaders-3.0"), GDK_PIXBUF_VERSION); if (argc == 1) { diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 70248a4641..c0bfea01c4 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -160,7 +160,7 @@ gdk_built_sources = \ # setup GDK sources and their dependencies # -gdkincludedir = $(includedir)/gtk-2.0/gdk +gdkincludedir = $(includedir)/gtk-3.0/gdk gdkinclude_HEADERS = $(gdk_public_h_sources) $(gdk_built_public_sources) common_sources = \ @@ -170,26 +170,26 @@ common_sources = \ gdkmarshalers.c \ gdkmarshalers.h -libgdk_directfb_2_0_la_SOURCES = $(common_sources) -libgdk_directfb_2_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS) \ +libgdk_directfb_3_0_la_SOURCES = $(common_sources) +libgdk_directfb_3_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS) \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -libgdk_directfb_2_0_la_LDFLAGS = $(LDADD) +libgdk_directfb_3_0_la_LDFLAGS = $(LDADD) -libgdk_x11_2_0_la_SOURCES = $(common_sources) -libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \ +libgdk_x11_3_0_la_SOURCES = $(common_sources) +libgdk_x11_3_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -libgdk_x11_2_0_la_LDFLAGS = $(LDADD) +libgdk_x11_3_0_la_LDFLAGS = $(LDADD) -libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c -libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \ +libgdk_quartz_3_0_la_SOURCES = $(common_sources) gdkkeynames.c +libgdk_quartz_3_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -libgdk_quartz_2_0_la_LDFLAGS = $(LDADD) +libgdk_quartz_3_0_la_LDFLAGS = $(LDADD) -libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c -libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \ +libgdk_win32_3_0_la_SOURCES = $(common_sources) gdkkeynames.c +libgdk_win32_3_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def -libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD) +libgdk_win32_3_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def +libgdk_win32_3_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD) if HAVE_INTROSPECTION @@ -200,13 +200,13 @@ introspection_files = \ gdkenumtypes.h \ $(srcdir)/x11/*.c -Gdk-2.0.gir: $(gdktargetlib) Makefile -Gdk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk --add-include-path=../gdk-pixbuf -Gdk_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 -Gdk_2_0_gir_LIBS = $(gdktargetlib) -Gdk_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files)) -Gdk_2_0_gir_CFLAGS = $(INCLUDES) -INTROSPECTION_GIRS += Gdk-2.0.gir +Gdk-3.0.gir: $(gdktargetlib) Makefile +Gdk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gdk --add-include-path=../gdk-pixbuf +Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-3.0 Pango-1.0 +Gdk_3_0_gir_LIBS = $(gdktargetlib) +Gdk_3_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files)) +Gdk_3_0_gir_CFLAGS = $(INCLUDES) +INTROSPECTION_GIRS += Gdk-3.0.gir girdir = $(datadir)/gir-1.0 dist_gir_DATA = $(INTROSPECTION_GIRS) @@ -219,9 +219,9 @@ endif if OS_WIN32 install-def-file: gdk.def - $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-2.0.def + $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def uninstall-def-file: - -rm $(DESTDIR)$(libdir)/gdk-win32-2.0.def + -rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def else install-def-file: uninstall-def-file: @@ -261,7 +261,7 @@ endif lib_LTLIBRARIES = $(gdktargetlib) -EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la +EXTRA_LTLIBRARIES = libgdk-x11-3.0.la libgdk-win32-3.0.la libgdk-quartz-3.0.la libgdk-directfb-3.0.la MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h EXTRA_DIST += $(gdk_built_sources) @@ -270,7 +270,7 @@ EXTRA_HEADERS = # # Rule to install gdkconfig.h header file # -configexecincludedir = $(libdir)/gtk-2.0/include +configexecincludedir = $(libdir)/gtk-3.0/include #configexecinclude_DATA = gdkconfig.h install-exec-local: gdkconfig.h @@ -325,7 +325,7 @@ stamp-gc-h: $(top_builddir)/config.status dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs9/gdk.vcproj: ../build/win32/vs9/gdk.vcprojin - for F in $(libgdk_win32_2_0_la_SOURCES); do \ + for F in $(libgdk_win32_3_0_la_SOURCES); do \ case $$F in \ *.c) echo ' ' \ ;; \ diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index 5d41ec8f3f..fd4067c787 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in include $(top_srcdir)/Makefile.decl -libgdkincludedir = $(includedir)/gtk-2.0/gdk +libgdkincludedir = $(includedir)/gtk-3.0/gdk INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ diff --git a/gtk+-2.0-uninstalled.pc.in b/gtk+-3.0-uninstalled.pc.in similarity index 84% rename from gtk+-2.0-uninstalled.pc.in rename to gtk+-3.0-uninstalled.pc.in index d89c856da6..238ad6ff9e 100644 --- a/gtk+-2.0-uninstalled.pc.in +++ b/gtk+-3.0-uninstalled.pc.in @@ -5,6 +5,6 @@ gtk_binary_version=@GTK_BINARY_VERSION@ Name: GTK+ Uninstalled Description: GTK+ Graphical UI Library (${target} target), Not Installed Version: @VERSION@ -Requires: gdk-${target}-2.0-uninstalled @GTK_PACKAGES@ +Requires: gdk-${target}-@GTK_API_VERSION@-uninstalled @GTK_PACKAGES@ Libs: ${pc_top_builddir}/${pcfiledir}/gtk/libgtk-${target}-@GTK_API_VERSION@.la @GTK_EXTRA_LIBS@ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GTK_EXTRA_CFLAGS@ diff --git a/gtk+-2.0.pc.in b/gtk+-3.0.pc.in similarity index 72% rename from gtk+-2.0.pc.in rename to gtk+-3.0.pc.in index 46853e1078..c159af1260 100644 --- a/gtk+-2.0.pc.in +++ b/gtk+-3.0.pc.in @@ -10,6 +10,6 @@ gtk_host=@host@ Name: GTK+ Description: GTK+ Graphical UI Library (${target} target) Version: @VERSION@ -Requires: gdk-${target}-2.0 @GTK_PACKAGES@ +Requires: gdk-${target}-@GTK_API_VERSION@ @GTK_PACKAGES@ Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_EXTRA_LIBS@ -Cflags: -I${includedir}/gtk-2.0 @GTK_EXTRA_CFLAGS@ +Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GTK_EXTRA_CFLAGS@ diff --git a/gtk+-unix-print-2.0.pc.in b/gtk+-unix-print-3.0.pc.in similarity index 66% rename from gtk+-unix-print-2.0.pc.in rename to gtk+-unix-print-3.0.pc.in index a0fe8f0339..5b8462a209 100644 --- a/gtk+-unix-print-2.0.pc.in +++ b/gtk+-unix-print-3.0.pc.in @@ -10,5 +10,5 @@ gtk_host=@host@ Name: GTK+ Description: GTK+ Unix print support Version: @VERSION@ -Requires: gtk+-${target}-2.0 @GTK_PACKAGES@ -Cflags: -I${includedir}/gtk-unix-print-2.0 +Requires: gtk+-${target}-@GTK_API_VERSION@ @GTK_PACKAGES@ +Cflags: -I${includedir}/gtk-@GTK_API_VERSION@/unix-print diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 5670626aad..2a0093e1d8 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -77,9 +77,9 @@ gtk-win32-res.o : gtk-win32.rc $(WINDRES) gtk-win32.rc $@ install-def-file: gtk.def - $(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def + $(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-3.0.def uninstall-def-file: - -rm $(DESTDIR)$(libdir)/gtk-win32-2.0.def + -rm $(DESTDIR)$(libdir)/gtk-win32-3.0.def else install-def-file: uninstall-def-file: @@ -122,7 +122,7 @@ if OS_LINUX TESTS += abicheck.sh pltcheck.sh endif -libgtkincludedir = $(includedir)/gtk-2.0/gtk +libgtkincludedir = $(includedir)/gtk-3.0/gtk libadd = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ $(top_builddir)/gdk/$(gdktargetlib) \ @@ -832,48 +832,48 @@ gtktestutils.c: gtktypefuncs.c # target platform: lib_LTLIBRARIES = $(gtktargetlib) -gtkincludedir = $(includedir)/gtk-2.0/gtk +gtkincludedir = $(includedir)/gtk-3.0/gtk gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h -gtkunixprintincludedir = $(includedir)/gtk-unix-print-2.0/gtk +gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources) -libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources) -libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources) -libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources) -libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources) +libgtk_x11_3_0_la_SOURCES = $(gtk_c_sources) +libgtk_win32_3_0_la_SOURCES = $(gtk_c_sources) +libgtk_quartz_3_0_la_SOURCES = $(gtk_c_sources) +libgtk_directfb_3_0_la_SOURCES = $(gtk_c_sources) -libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) -libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid -libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) -libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) +libgtk_x11_3_0_la_LDFLAGS = $(libtool_opts) +libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid +libgtk_quartz_3_0_la_LDFLAGS = $(libtool_opts) +libgtk_directfb_3_0_la_LDFLAGS = $(libtool_opts) -libgtk_x11_2_0_la_LIBADD = $(libadd) -libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -libgtk_quartz_2_0_la_LIBADD = $(libadd) -libgtk_directfb_2_0_la_LIBADD = $(libadd) +libgtk_x11_3_0_la_LIBADD = $(libadd) +libgtk_win32_3_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 +libgtk_quartz_3_0_la_LIBADD = $(libadd) +libgtk_directfb_3_0_la_LIBADD = $(libadd) -libgtk_x11_2_0_la_DEPENDENCIES = $(deps) -libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps) -libgtk_quartz_2_0_la_DEPENDENCIES = $(deps) -libgtk_directfb_2_0_la_DEPENDENCIES = $(deps) +libgtk_x11_3_0_la_DEPENDENCIES = $(deps) +libgtk_win32_3_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps) +libgtk_quartz_3_0_la_DEPENDENCIES = $(deps) +libgtk_directfb_3_0_la_DEPENDENCIES = $(deps) if USE_WIN32 libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) endif -EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la +EXTRA_LTLIBRARIES = libgtk-x11-3.0.la libgtk-win32-3.0.la libgtk-quartz-3.0.la libgtk-directfb-3.0.la -install-exec-hook: +install-exec-hook: if DISABLE_EXPLICIT_DEPS $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gtktargetlib) endif if USE_QUARTZ install-mac-key-theme: - $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Mac/gtk-2.0-key - $(INSTALL_DATA) $(srcdir)/gtkrc.key.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-2.0-key/gtkrc + $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key + $(INSTALL_DATA) $(srcdir)/gtkrc.key.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key/gtkrc uninstall-mac-key-theme: - rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-2.0-key/gtkrc + rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key/gtkrc else install-mac-key-theme: uninstall-mac-key-theme: @@ -893,17 +893,17 @@ dist-hook: ../build/win32/vs9/gtk.vcproj # Install a RC file for the default GTK+ theme, and key themes install-data-local: install-ms-lib install-def-file install-mac-key-theme - $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0 - $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0/gtkrc - $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key - $(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc - $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key - $(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc + $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0 + $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtkrc + $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key + $(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key/gtkrc + $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key + $(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key/gtkrc uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme - rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0/gtkrc - rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc - rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc + rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtkrc + rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key/gtkrc + rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key/gtkrc # if srcdir!=builddir, clean out maintainer-clean files from builddir # this allows dist to pass. @@ -929,17 +929,17 @@ introspection_files = \ gtktypebuiltins.h \ gtktypebuiltins.c -Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-2.0.gir Makefile -Gtk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gtk -Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0 -Gtk_2_0_gir_CFLAGS = \ +Gtk-3.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-3.0.gir Makefile +Gtk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gtk +Gtk_3_0_gir_INCLUDES = Atk-1.0 Gdk-3.0 +Gtk_3_0_gir_CFLAGS = \ $(INCLUDES) \ -UGDK_DISABLE_DEPRECATED \ -UGTK_DISABLE_DEPRECATED \ -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API -Gtk_2_0_gir_LIBS = $(gtktargetlib) -Gtk_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) -INTROSPECTION_GIRS += Gtk-2.0.gir +Gtk_3_0_gir_LIBS = $(gtktargetlib) +Gtk_3_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) +INTROSPECTION_GIRS += Gtk-3.0.gir girdir = $(datadir)/gir-1.0 dist_gir_DATA = $(INTROSPECTION_GIRS) @@ -954,10 +954,10 @@ endif # Installed tools # bin_PROGRAMS = \ - gtk-query-immodules-2.0 \ - gtk-update-icon-cache + gtk-query-immodules-3.0 \ + gtk-update-icon-cache-3.0 -bin_SCRIPTS = gtk-builder-convert +bin_SCRIPTS = gtk-builder-convert-3.0 if OS_WIN32 @@ -992,17 +992,17 @@ gtk-update-icon-cache.exe.manifest: endif -gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) -gtk_query_immodules_2_0_LDADD = $(LDADDS) +gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS) +gtk_query_immodules_3_0_LDADD = $(LDADDS) -gtk_query_immodules_2_0_SOURCES = queryimmodules.c +gtk_query_immodules_3_0_SOURCES = queryimmodules.c -gtk_update_icon_cache_LDADD = \ +gtk_update_icon_cache_3_0_LDADD = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ $(GDK_PIXBUF_DEP_LIBS) -gtk_update_icon_cache_SOURCES = \ +gtk_update_icon_cache_3_0_SOURCES = \ updateiconcache.c .PHONY: files test test-debug @@ -1309,11 +1309,11 @@ gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) else gtk_update_icon_cache_program = \ GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ - ./gtk-update-icon-cache + ./gtk-update-icon-cache-3.0 endif gtkbuiltincache.h: @REBUILD@ stamp-icons - $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) + $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache-3.0$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) $(gtk_update_icon_cache_program) --force --ignore-theme-index \ --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ mv gtkbuiltincache.h.tmp gtkbuiltincache.h diff --git a/gtk/gtk-builder-convert b/gtk/gtk-builder-convert-3.0 similarity index 99% rename from gtk/gtk-builder-convert rename to gtk/gtk-builder-convert-3.0 index a641b3385d..4cae240a66 100755 --- a/gtk/gtk-builder-convert +++ b/gtk/gtk-builder-convert-3.0 @@ -21,7 +21,7 @@ # TODO: # Toolbars -"""Usage: gtk-builder-convert [OPTION] [INPUT] [OUTPUT] +"""Usage: gtk-builder-convert-3.0 [OPTION] [INPUT] [OUTPUT] Converts Glade files into XML files which can be loaded with GtkBuilder. The [INPUT] file is @@ -32,7 +32,7 @@ The [INPUT] file is When OUTPUT is -, write to standard output. Examples: - gtk-builder-convert preference.glade preferences.ui + gtk-builder-convert-3.0 preference.glade preferences.ui Report bugs to http://bugzilla.gnome.org/.""" @@ -258,7 +258,7 @@ class GtkBuilderConverter(object): for node in objects: self._convert(node.getAttribute("class"), node) if self._get_object(node.getAttribute('id')) is not None: - print "WARNING: duplicate id \"" + node.getAttribute('id') + "\"" + print "WARNING: duplicate id \"" + node.getAttribute('id') + "\"" self.objects[node.getAttribute('id')] = node # Convert Gazpachos UI tag diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index 7341b63974..c64678aa20 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -255,7 +255,7 @@ * You can change these defaults to something else. For * example, to add a Shift modifier to a few * of the default bindings, you can include the following - * fragment in your .gtkrc-2.0 file: + * fragment in your .gtkrc-3.0 file: * * * binding "my-own-gtkfilechooser-bindings" { @@ -330,7 +330,7 @@ * frequently. You could then create an * Alt M * shortcut by including the following in your - * .gtkrc-2.0: + * .gtkrc-3.0: * * binding "misc-shortcut" { * bind "<Alt>M" { diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c index 2768b0b153..7aec5c1d6b 100644 --- a/gtk/gtkimcontext.c +++ b/gtk/gtkimcontext.c @@ -96,7 +96,7 @@ * * After a new loadable input method module has been installed on the system, * the configuration file gtk.immodules needs to be - * regenerated by gtk-query-immodules-2.0, + * regenerated by gtk-query-immodules-3.0, * in order for the new input method to become available to GTK+ applications. */ diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c index a6b40d88b5..b0b0e7e18a 100644 --- a/gtk/gtkmodules.c +++ b/gtk/gtkmodules.c @@ -66,15 +66,15 @@ get_module_path (void) home_dir = g_get_home_dir(); if (home_dir) - home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL); + home_gtk_dir = g_build_filename (home_dir, ".gtk-3.0", NULL); module_path_env = g_getenv ("GTK_PATH"); exe_prefix = g_getenv ("GTK_EXE_PREFIX"); if (exe_prefix) - default_dir = g_build_filename (exe_prefix, "lib", "gtk-2.0", NULL); + default_dir = g_build_filename (exe_prefix, "lib", "gtk-3.0", NULL); else - default_dir = g_build_filename (GTK_LIBDIR, "gtk-2.0", NULL); + default_dir = g_build_filename (GTK_LIBDIR, "gtk-3.0", NULL); if (module_path_env && home_gtk_dir) module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S, diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 7ddd3311f8..a23a605785 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -399,9 +399,9 @@ gtk_rc_make_default_dir (const gchar *type) var = g_getenv ("GTK_EXE_PREFIX"); if (var) - path = g_build_filename (var, "lib", "gtk-2.0", GTK_BINARY_VERSION, type, NULL); + path = g_build_filename (var, "lib", "gtk-3.0", GTK_BINARY_VERSION, type, NULL); else - path = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, type, NULL); + path = g_build_filename (GTK_LIBDIR, "gtk-3.0", GTK_BINARY_VERSION, type, NULL); return path; } @@ -450,7 +450,7 @@ gtk_rc_get_im_module_file (void) if (im_module_file) result = g_strdup (im_module_file); else - result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); + result = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtk.immodules", NULL); } return result; @@ -522,7 +522,7 @@ gtk_rc_add_initial_default_files (void) else { const gchar *home; - str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL); + str = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtkrc", NULL); gtk_rc_add_default_file (str); g_free (str); @@ -530,7 +530,7 @@ gtk_rc_add_initial_default_files (void) home = g_get_home_dir (); if (home) { - str = g_build_filename (home, ".gtkrc-2.0", NULL); + str = g_build_filename (home, ".gtkrc-3.0", NULL); gtk_rc_add_default_file (str); g_free (str); } @@ -795,11 +795,11 @@ gtk_rc_parse_named (GtkRcContext *context, gchar *subpath; if (type) - subpath = g_strconcat ("gtk-2.0-", type, + subpath = g_strconcat ("gtk-3.0-", type, G_DIR_SEPARATOR_S "gtkrc", NULL); else - subpath = g_strdup ("gtk-2.0" G_DIR_SEPARATOR_S "gtkrc"); + subpath = g_strdup ("gtk-3.0" G_DIR_SEPARATOR_S "gtkrc"); /* First look in the users home directory */ diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am index d257f2b316..6b9b3e4f85 100644 --- a/gtk/tests/Makefile.am +++ b/gtk/tests/Makefile.am @@ -63,7 +63,7 @@ crossingevents_SOURCES = crossingevents.c crossingevents_LDADD = $(progs_ldadd) # this doesn't work in make distcheck, since it doesn't -# find file-chooser-test-dir +# find file-chooser-test-dir # TEST_PROGS += filechooser filechooser_SOURCES = filechooser.c pixbuf-init.c filechooser_LDADD = $(progs_ldadd) @@ -76,7 +76,7 @@ builder_LDFLAGS = -export-dynamic if OS_UNIX TEST_PROGS += defaultvalue endif -defaultvalue_SOURCES = defaultvalue.c pixbuf-init.c +defaultvalue_SOURCES = defaultvalue.c pixbuf-init.c defaultvalue_LDADD = $(progs_ldadd) TEST_PROGS += textbuffer diff --git a/modules/engines/ms-windows/Makefile.am b/modules/engines/ms-windows/Makefile.am index 541bf9e8b2..663616deab 100644 --- a/modules/engines/ms-windows/Makefile.am +++ b/modules/engines/ms-windows/Makefile.am @@ -13,12 +13,12 @@ INCLUDES = \ LDADDS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-3.0.la \ $(top_builddir)/gdk/$(gdktargetlib) \ $(top_builddir)/gtk/$(gtktargetlib) \ $(GTK_DEP_LIBS) -enginedir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/engines +enginedir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/engines engine_LTLIBRARIES = libwimp.la diff --git a/modules/engines/ms-windows/Theme/Makefile.am b/modules/engines/ms-windows/Theme/Makefile.am index e7fad20372..dcb2dac4f0 100644 --- a/modules/engines/ms-windows/Theme/Makefile.am +++ b/modules/engines/ms-windows/Theme/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.decl -SUBDIRS=gtk-2.0 +SUBDIRS=gtk-3.0 -include $(top_srcdir)/git.mk diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am b/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.am similarity index 100% rename from modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am rename to modules/engines/ms-windows/Theme/gtk-3.0/Makefile.am diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc b/modules/engines/ms-windows/Theme/gtk-3.0/gtkrc similarity index 100% rename from modules/engines/ms-windows/Theme/gtk-2.0/gtkrc rename to modules/engines/ms-windows/Theme/gtk-3.0/gtkrc diff --git a/modules/engines/pixbuf/Makefile.am b/modules/engines/pixbuf/Makefile.am index f90bdd5532..05f6ebb6ef 100644 --- a/modules/engines/pixbuf/Makefile.am +++ b/modules/engines/pixbuf/Makefile.am @@ -12,12 +12,12 @@ INCLUDES = \ $(GTK_DEP_CFLAGS) LDADDS = \ - $(GTK_DEP_LIBS) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) + $(GTK_DEP_LIBS) \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) -enginedir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/engines +enginedir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/engines engine_LTLIBRARIES = libpixmap.la diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index 9a1bf2e861..5c58211e86 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -27,7 +27,7 @@ LDADDS = \ $(top_builddir)/gtk/$(gtktargetlib) \ $(GTK_DEP_LIBS) -moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules +moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_xim_la_SOURCES = \ @@ -40,7 +40,7 @@ if HAVE_X11R6 if INCLUDE_IM_XIM STATIC_XIM_MODULE = libstatic-im-xim.la else -XIM_MODULE=im-xim.la +XIM_MODULE=im-xim.la endif endif @@ -152,7 +152,7 @@ if USE_WIN32 if INCLUDE_IM_IME STATIC_IME_MODULE = libstatic-im-ime.la else -IME_MODULE=im-ime.la +IME_MODULE=im-ime.la endif endif @@ -172,7 +172,7 @@ else MULTIPRESS_MODULE = im-multipress.la endif -imconffiledir = $(sysconfdir)/gtk-2.0 +imconffiledir = $(sysconfdir)/gtk-3.0 dist_imconffile_DATA = im-multipress.conf if CROSS_COMPILING @@ -189,21 +189,21 @@ endif # after the libraries are installed in their final locations. install-data-hook: @if $(RUN_QUERY_IMMODULES_TEST) ; then \ - echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ - echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \ - $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \ + echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-3.0 ; \ + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-3.0 ; \ + echo "$(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(sysconfdir)/gtk-3.0/gtk.immodules" ; \ + $(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(sysconfdir)/gtk-3.0/gtk.immodules ; \ else \ echo "***" ; \ echo "*** Warning: gtk.immodules not built" ; \ echo "***" ; \ echo "*** Generate this file manually on host" ; \ - echo "*** system using gtk-query-immodules-2.0" ; \ + echo "*** system using gtk-query-immodules-3.0" ; \ echo "***" ; \ fi uninstall-local: - rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules + rm -f $(DESTDIR)$(sysconfdir)/gtk-3.0/gtk.immodules if BUILD_DYNAMIC_MODULES @@ -240,7 +240,7 @@ noinst_LTLIBRARIES = \ included-modules: $(noinst_LTLIBRARIES) gtk.immodules: Makefile.am $(module_LTLIBRARIES) - $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules + $(top_builddir)/gtk/gtk-query-immodules-3.0 $(module_LTLIBRARIES) > gtk.immodules CLEANFILES = gtk.immodules diff --git a/modules/other/gail/Makefile.am b/modules/other/gail/Makefile.am index 882f14ed39..bdbcd984d6 100644 --- a/modules/other/gail/Makefile.am +++ b/modules/other/gail/Makefile.am @@ -6,7 +6,7 @@ if PLATFORM_WIN32 no_undefined = -no-undefined endif -moduledir = $(libdir)/gtk-2.0/modules +moduledir = $(libdir)/gtk-3.0/modules module_LTLIBRARIES = libgail.la gail_c_sources = \ diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am index 463199e829..de4d77477d 100644 --- a/modules/printbackends/cups/Makefile.am +++ b/modules/printbackends/cups/Makefile.am @@ -20,7 +20,7 @@ LDADDS = \ $(top_builddir)/gdk/$(gdktargetlib) \ $(GTK_DEP_LIBS) -backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends +backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends backend_LTLIBRARIES = libprintbackend-cups.la diff --git a/modules/printbackends/file/Makefile.am b/modules/printbackends/file/Makefile.am index 904f7687d4..30469e981b 100644 --- a/modules/printbackends/file/Makefile.am +++ b/modules/printbackends/file/Makefile.am @@ -4,7 +4,7 @@ if PLATFORM_WIN32 no_undefined = -no-undefined endif -backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends +backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends backend_LTLIBRARIES = libprintbackend-file.la diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am index 12b7fcefd6..379fa4964a 100644 --- a/modules/printbackends/lpr/Makefile.am +++ b/modules/printbackends/lpr/Makefile.am @@ -16,9 +16,9 @@ INCLUDES = \ LDADDS = \ $(GTK_DEP_LIBS) \ - $(top_builddir)/gtk/$(gtktargetlib) + $(top_builddir)/gtk/$(gtktargetlib) -backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends +backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends backend_LTLIBRARIES = libprintbackend-lpr.la diff --git a/modules/printbackends/test/Makefile.am b/modules/printbackends/test/Makefile.am index 20904fa517..2f61165e0e 100644 --- a/modules/printbackends/test/Makefile.am +++ b/modules/printbackends/test/Makefile.am @@ -4,7 +4,7 @@ if PLATFORM_WIN32 no_undefined = -no-undefined endif -backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends +backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends backend_LTLIBRARIES = libprintbackend-test.la diff --git a/perf/Makefile.am b/perf/Makefile.am index 5662b32df2..68d18185d6 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -63,7 +63,7 @@ stamp-marshalers.h: @REBUILD@ marshalers.list $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/marshalers.list --header >> xgen-gmlh \ && (cmp -s xgen-gmlh marshalers.h || cp xgen-gmlh marshalers.h) \ && rm -f xgen-gmlh \ - && echo timestamp > $(@F) + && echo timestamp > $(@F) marshalers.c: @REBUILD@ marshalers.list $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/marshalers.list --body >> xgen-gmlc \ && cp xgen-gmlc marshalers.c \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 692e90ff71..3083b29a09 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -254,15 +254,15 @@ testentryicons_SOURCES = \ testfilechooser_SOURCES = \ prop-editor.c \ - testfilechooser.c + testfilechooser.c testfilechooserbutton_SOURCES = \ prop-editor.c \ - testfilechooserbutton.c + testfilechooserbutton.c testgtk_SOURCES = \ prop-editor.c \ - testgtk.c + testgtk.c testtreeedit_SOURCES = \ testtreeedit.c @@ -272,11 +272,11 @@ testtreemodel_SOURCES = \ testtreeview_SOURCES = \ prop-editor.c \ - testtreeview.c + testtreeview.c testtext_SOURCES = \ prop-editor.c \ - testtext.c + testtext.c testtoolbar_SOURCES = \ testtoolbar.c \ -- 2.30.2